rpms/control-center/devel default-applications.patch, NONE, 1.1 control-center.spec, 1.318, 1.319 gnome-bg.patch, 1.4, 1.5 control-center-2.19.91-default-apps.patch, 1.1, NONE
Matthias Clasen (mclasen)
fedora-extras-commits at redhat.com
Fri Dec 21 17:25:38 UTC 2007
Author: mclasen
Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7803
Modified Files:
control-center.spec gnome-bg.patch
Added Files:
default-applications.patch
Removed Files:
control-center-2.19.91-default-apps.patch
Log Message:
update patches
default-applications.patch:
--- NEW FILE default-applications.patch ---
diff -up gnome-control-center-2.21.4/capplets/default-applications/gnome-default-applications.xml.in.default-apps gnome-control-center-2.21.4/capplets/default-applications/gnome-default-applications.xml.in
--- gnome-control-center-2.21.4/capplets/default-applications/gnome-default-applications.xml.in.default-apps 2007-12-20 17:00:56.000000000 -0500
+++ gnome-control-center-2.21.4/capplets/default-applications/gnome-default-applications.xml.in 2007-12-21 12:23:29.000000000 -0500
@@ -44,52 +44,12 @@
<win-command>galeon -w %s</win-command>
</web-browser>
<web-browser>
- <_name>Encompass</_name>
- <executable>encompass</executable>
- <command>encompass %s</command>
- <icon-name>encompass</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>false</netscape-remote>
- </web-browser>
- <web-browser>
- <_name>Firebird</_name>
- <executable>mozilla-firebird</executable>
- <command>mozilla-firebird %s</command>
- <icon-name></icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>mozilla-firebird -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>mozilla-firebird -remote "openurl(%s,new-window)"</win-command>
- </web-browser>
- <web-browser>
<_name>Firefox</_name>
<executable>firefox</executable>
<command>firefox %s</command>
<icon-name>firefox</icon-name>
<run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>firefox -new-tab "%s"</tab-command>
- <win-command>firefox -new-window "%s"</win-command>
- </web-browser>
- <web-browser>
- <_name>Iceweasel</_name>
- <executable>iceweasel</executable>
- <command>iceweasel %s</command>
- <icon-name>iceweasel</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>iceweasel -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>iceweasel -remote "openurl(%s,new-window)"</win-command>
- </web-browser>
- <web-browser>
- <_name>Mozilla 1.6</_name>
- <executable>mozilla-1.6</executable>
- <command>mozilla-1.6 %s</command>
- <icon-name>mozilla-icon</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>mozilla-1.6 -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>mozilla-1.6 -remote "openurl(%s,new-window)"</win-command>
+ <netscape-remote>false</netscape-remote>
</web-browser>
<web-browser>
<_name>Mozilla</_name>
@@ -97,9 +57,7 @@
<command>mozilla %s</command>
<icon-name>mozilla-icon</icon-name>
<run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>mozilla -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>mozilla -remote "openurl(%s,new-window)"</win-command>
+ <netscape-remote>false</netscape-remote>
</web-browser>
<web-browser>
<_name>SeaMonkey</_name>
@@ -112,24 +70,12 @@
<win-command>seamonkey -remote "openurl(%s,new-window)"</win-command>
</web-browser>
<web-browser>
- <_name>Iceape</_name>
- <executable>iceape</executable>
- <command>iceape %s</command>
- <icon-name>iceape</icon-name>
- <run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>iceape -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>iceape -remote "openurl(%s,new-window)"</win-command>
- </web-browser>
- <web-browser>
- <_name>Netscape Communicator</_name>
+ <_name>Netscape</_name>
<executable>netscape</executable>
<command>netscape %s</command>
<icon-name>netscape</icon-name>
<run-in-terminal>false</run-in-terminal>
- <netscape-remote>true</netscape-remote>
- <tab-command>netscape -remote "openurl(%s,new-tab)"</tab-command>
- <win-command>netscape -remote "openurl(%s,new-window)"</win-command>
+ <netscape-remote>false</netscape-remote>
</web-browser>
<web-browser>
<_name>Konqueror</_name>
@@ -153,7 +99,7 @@
<mail-reader>
<_name>Evolution Mail Reader</_name>
<executable>evolution</executable>
- <command>evolution %s</command>
+ <command>evolution --component=mail %s</command>
<icon-name>evolution</icon-name>
<run-in-terminal>false</run-in-terminal>
</mail-reader>
@@ -179,27 +125,13 @@
<run-in-terminal>false</run-in-terminal>
</mail-reader>
<mail-reader>
- <_name>Thunderbird</_name>
+ <_name>Thunderbird Mail</_name>
<executable>thunderbird</executable>
<command>thunderbird %s</command>
<icon-name>thunderbird</icon-name>
<run-in-terminal>false</run-in-terminal>
</mail-reader>
<mail-reader>
- <_name>Mozilla Thunderbird</_name>
- <executable>mozilla-thunderbird</executable>
- <command>mozilla-thunderbird %s</command>
- <icon-name>thunderbird</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Mozilla Mail</_name>
- <executable>mozilla</executable>
- <command>mozilla -mail %s</command>
- <icon-name>mozilla-mail-icon</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
<_name>SeaMonkey Mail</_name>
<executable>seamonkey</executable>
<command>seamonkey -mail %s</command>
@@ -228,6 +160,13 @@
<run-in-terminal>false</run-in-terminal>
</mail-reader>
<mail-reader>
+ <_name>Sylpheed</_name>
+ <executable>sylpheed</executable>
+ <command>sylpheed --compose %s</command>
+ <icon-name>sylpheed</icon-name>
+ <run-in-terminal>false</run-in-terminal>
+ </mail-reader>
+ <mail-reader>
<_name>Sylpheed-Claws</_name>
<executable>sylpheed-claws</executable>
<command>sylpheed-claws --compose %s</command>
@@ -252,6 +191,20 @@
<exec-flag>-e</exec-flag>
</terminal>
<terminal>
+ <_name>KDE Konsole</_name>
+ <executable>konsole</executable>
+ <command>konsole</command>
+ <icon-name>konsole</icon-name>
+ <exec-flag>-e</exec-flag>
+ </terminal>
+ <terminal>
+ <_name>KTerm</_name>
+ <executable>kterm</executable>
+ <command>kterm</command>
+ <icon-name>kterm</icon-name>
+ <exec-flag>-e</exec-flag>
+ </terminal>
+ <terminal>
<_name>GNOME Terminal</_name>
<executable>gnome-terminal</executable>
<command>gnome-terminal</command>
Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- control-center.spec 21 Dec 2007 06:21:38 -0000 1.318
+++ control-center.spec 21 Dec 2007 17:25:00 -0000 1.319
@@ -28,12 +28,6 @@
Group: User Interface/Desktops
Source: http://download.gnome.org/sources/gnome-control-center/2.21/gnome-control-center-%{version}.tar.bz2
-# Optionally bring up beagle or tracker if available
-# http://bugzilla.gnome.org/show_bug.cgi?id=497802
-Patch0: control-center-2.19.1-search.patch
-# drop help button from a dialog that doesn't have help
-# http://bugzilla.gnome.org/show_bug.cgi?id=497803
-Patch1: control-center-2.16.0-about-me-help.patch
Patch2: control-center-2.20.0-enable-sound-by-default.patch
Patch3: control-center-2.19.3-no-gnome-common.patch
Patch4: gnome-bg.patch
@@ -49,7 +43,7 @@
Patch95: control-center-2.19.91-passwd.patch
Patch96: control-center-2.19.90-gecos.patch
# change default preferred apps to programs we ship
-Patch99: control-center-2.19.91-default-apps.patch
+Patch99: default-applications.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=504182
Patch100: im-setting.patch
@@ -165,8 +159,6 @@
%prep
%setup -q -n gnome-control-center-%{version}
-%patch0 -p1 -b .search
-%patch1 -p1 -b .about-me-help
%patch2 -p0 -b .enable-sound
%patch3 -p1 -b .no-gnome-common
%patch4 -p1 -b .gnome-bg
gnome-bg.patch:
Index: gnome-bg.patch
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/gnome-bg.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-bg.patch 13 Nov 2007 23:50:42 -0000 1.4
+++ gnome-bg.patch 21 Dec 2007 17:25:00 -0000 1.5
@@ -1,6 +1,6 @@
-diff -up gnome-control-center-2.21.2/capplets/appearance/gnome-wp-info.h.gnome-bg gnome-control-center-2.21.2/capplets/appearance/gnome-wp-info.h
---- gnome-control-center-2.21.2/capplets/appearance/gnome-wp-info.h.gnome-bg 2007-05-03 08:33:46.000000000 -0400
-+++ gnome-control-center-2.21.2/capplets/appearance/gnome-wp-info.h 2007-11-13 18:26:59.000000000 -0500
+diff -up gnome-control-center-2.21.4/capplets/appearance/gnome-wp-info.h.gnome-bg gnome-control-center-2.21.4/capplets/appearance/gnome-wp-info.h
+--- gnome-control-center-2.21.4/capplets/appearance/gnome-wp-info.h.gnome-bg 2007-05-31 17:54:56.000000000 -0400
++++ gnome-control-center-2.21.4/capplets/appearance/gnome-wp-info.h 2007-12-21 12:14:44.000000000 -0500
@@ -40,7 +40,6 @@ struct _GnomeWPInfo {
GnomeWPInfo * gnome_wp_info_new (const gchar * uri,
@@ -9,9 +9,9 @@
void gnome_wp_info_free (GnomeWPInfo * info);
#endif
-diff -up gnome-control-center-2.21.2/capplets/appearance/gnome-wp-xml.c.gnome-bg gnome-control-center-2.21.2/capplets/appearance/gnome-wp-xml.c
---- gnome-control-center-2.21.2/capplets/appearance/gnome-wp-xml.c.gnome-bg 2007-11-03 13:53:43.000000000 -0400
-+++ gnome-control-center-2.21.2/capplets/appearance/gnome-wp-xml.c 2007-11-13 18:26:59.000000000 -0500
+diff -up gnome-control-center-2.21.4/capplets/appearance/gnome-wp-xml.c.gnome-bg gnome-control-center-2.21.4/capplets/appearance/gnome-wp-xml.c
+--- gnome-control-center-2.21.4/capplets/appearance/gnome-wp-xml.c.gnome-bg 2007-12-20 17:00:54.000000000 -0500
++++ gnome-control-center-2.21.4/capplets/appearance/gnome-wp-xml.c 2007-12-21 12:14:44.000000000 -0500
@@ -231,7 +231,11 @@ static void gnome_wp_xml_load_xml (Appea
g_hash_table_insert (data->wp_hash, wp->filename, wp);
} else {
@@ -24,9 +24,9 @@
}
}
xmlFreeDoc (wplist);
-diff -up gnome-control-center-2.21.2/capplets/appearance/gnome-wp-info.c.gnome-bg gnome-control-center-2.21.2/capplets/appearance/gnome-wp-info.c
---- gnome-control-center-2.21.2/capplets/appearance/gnome-wp-info.c.gnome-bg 2007-05-03 08:33:46.000000000 -0400
-+++ gnome-control-center-2.21.2/capplets/appearance/gnome-wp-info.c 2007-11-13 18:26:59.000000000 -0500
+diff -up gnome-control-center-2.21.4/capplets/appearance/gnome-wp-info.c.gnome-bg gnome-control-center-2.21.4/capplets/appearance/gnome-wp-info.c
+--- gnome-control-center-2.21.4/capplets/appearance/gnome-wp-info.c.gnome-bg 2007-05-31 17:54:56.000000000 -0400
++++ gnome-control-center-2.21.4/capplets/appearance/gnome-wp-info.c 2007-12-21 12:14:44.000000000 -0500
@@ -67,27 +67,6 @@ GnomeWPInfo * gnome_wp_info_new (const g
return new;
}
@@ -55,9 +55,9 @@
void gnome_wp_info_free (GnomeWPInfo * info) {
if (info == NULL) {
return;
-diff -up gnome-control-center-2.21.2/capplets/appearance/gnome-wp-item.h.gnome-bg gnome-control-center-2.21.2/capplets/appearance/gnome-wp-item.h
---- gnome-control-center-2.21.2/capplets/appearance/gnome-wp-item.h.gnome-bg 2007-11-03 13:53:43.000000000 -0400
-+++ gnome-control-center-2.21.2/capplets/appearance/gnome-wp-item.h 2007-11-13 18:26:59.000000000 -0500
+diff -up gnome-control-center-2.21.4/capplets/appearance/gnome-wp-item.h.gnome-bg gnome-control-center-2.21.4/capplets/appearance/gnome-wp-item.h
+--- gnome-control-center-2.21.4/capplets/appearance/gnome-wp-item.h.gnome-bg 2007-12-20 17:00:54.000000000 -0500
++++ gnome-control-center-2.21.4/capplets/appearance/gnome-wp-item.h 2007-12-21 12:14:44.000000000 -0500
@@ -24,6 +24,7 @@
#include <libgnomeui/gnome-thumbnail.h>
#include <gnome-wp-info.h>
@@ -95,9 +95,9 @@
#endif
-diff -up gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c.gnome-bg gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c
---- gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c.gnome-bg 2007-11-03 13:53:43.000000000 -0400
-+++ gnome-control-center-2.21.2/capplets/appearance/appearance-desktop.c 2007-11-13 18:26:59.000000000 -0500
+diff -up gnome-control-center-2.21.4/capplets/appearance/appearance-desktop.c.gnome-bg gnome-control-center-2.21.4/capplets/appearance/appearance-desktop.c
+--- gnome-control-center-2.21.4/capplets/appearance/appearance-desktop.c.gnome-bg 2007-12-20 17:00:54.000000000 -0500
++++ gnome-control-center-2.21.4/capplets/appearance/appearance-desktop.c 2007-12-21 12:14:44.000000000 -0500
@@ -29,6 +29,7 @@
#include <string.h>
#include <gconf/gconf-client.h>
@@ -158,9 +158,9 @@
gtk_tree_path_free (path);
}
-diff -up gnome-control-center-2.21.2/capplets/appearance/gnome-wp-item.c.gnome-bg gnome-control-center-2.21.2/capplets/appearance/gnome-wp-item.c
---- gnome-control-center-2.21.2/capplets/appearance/gnome-wp-item.c.gnome-bg 2007-11-03 13:53:43.000000000 -0400
-+++ gnome-control-center-2.21.2/capplets/appearance/gnome-wp-item.c 2007-11-13 18:36:48.000000000 -0500
+diff -up gnome-control-center-2.21.4/capplets/appearance/gnome-wp-item.c.gnome-bg gnome-control-center-2.21.4/capplets/appearance/gnome-wp-item.c
+--- gnome-control-center-2.21.4/capplets/appearance/gnome-wp-item.c.gnome-bg 2007-12-20 17:00:54.000000000 -0500
++++ gnome-control-center-2.21.4/capplets/appearance/gnome-wp-item.c 2007-12-21 12:21:23.000000000 -0500
@@ -25,10 +25,56 @@
#include <gnome.h>
#include <string.h>
@@ -218,22 +218,17 @@
GnomeWPItem * gnome_wp_item_new (const gchar * filename,
GHashTable * wallpapers,
GnomeThumbnailFactory * thumbnails) {
-@@ -45,8 +91,12 @@ GnomeWPItem * gnome_wp_item_new (const g
+@@ -45,8 +91,7 @@ GnomeWPItem * gnome_wp_item_new (const g
item->fileinfo = gnome_wp_info_new (item->filename, thumbnails);
- if (item->fileinfo != NULL &&
-- !strcmp (item->fileinfo->mime_type, "image/")) {
+- g_str_has_prefix (item->fileinfo->mime_type, "image/")) {
+ if (item->fileinfo != NULL) {
-+#if 0
-+ && !strcmp (item->fileinfo->mime_type, "image/")) {
-+#else
-+
-+#endif
if (item->name == NULL) {
if (g_utf8_validate (item->fileinfo->name, -1, NULL))
item->name = g_strdup (item->fileinfo->name);
-@@ -88,6 +138,10 @@ GnomeWPItem * gnome_wp_item_new (const g
+@@ -88,6 +133,10 @@ GnomeWPItem * gnome_wp_item_new (const g
item = NULL;
}
@@ -244,7 +239,7 @@
g_object_unref (client);
return item;
-@@ -111,43 +165,14 @@ void gnome_wp_item_free (GnomeWPItem * i
+@@ -111,43 +160,14 @@ void gnome_wp_item_free (GnomeWPItem * i
gdk_color_free (item->scolor);
gnome_wp_info_free (item->fileinfo);
@@ -290,7 +285,7 @@
static void collect_save_options (GdkPixbuf * pixbuf,
gchar *** keys,
gchar *** vals,
-@@ -201,153 +226,18 @@ static void collect_save_options (GdkPix
+@@ -201,153 +221,18 @@ static void collect_save_options (GdkPix
GdkPixbuf * gnome_wp_item_get_thumbnail (GnomeWPItem * item,
GnomeThumbnailFactory * thumbs) {
@@ -456,7 +451,7 @@
}
void gnome_wp_item_update_description (GnomeWPItem * item) {
-@@ -356,6 +246,12 @@ void gnome_wp_item_update_description (G
+@@ -356,6 +241,12 @@ void gnome_wp_item_update_description (G
if (!strcmp (item->filename, "(none)")) {
item->description = g_strdup (item->name);
} else {
@@ -469,7 +464,7 @@
gchar *dirname = g_path_get_dirname (item->filename);
/* translators: <b>wallpaper name</b>
* mime type, x pixel(s) by y pixel(s)
-@@ -366,7 +262,7 @@ void gnome_wp_item_update_description (G
+@@ -365,7 +256,7 @@ void gnome_wp_item_update_description (G
"%s, %d %s by %d %s\n"
"Folder: %s"),
item->name,
@@ -478,9 +473,9 @@
item->width,
ngettext ("pixel", "pixels", item->width),
item->height,
-diff -up gnome-control-center-2.21.2/gnome-settings-daemon/gnome-settings-background.c.gnome-bg gnome-control-center-2.21.2/gnome-settings-daemon/gnome-settings-background.c
---- gnome-control-center-2.21.2/gnome-settings-daemon/gnome-settings-background.c.gnome-bg 2007-07-02 08:30:05.000000000 -0400
-+++ gnome-control-center-2.21.2/gnome-settings-daemon/gnome-settings-background.c 2007-11-13 18:26:59.000000000 -0500
+diff -up gnome-control-center-2.21.4/gnome-settings-daemon/gnome-settings-background.c.gnome-bg gnome-control-center-2.21.4/gnome-settings-daemon/gnome-settings-background.c
+--- gnome-control-center-2.21.4/gnome-settings-daemon/gnome-settings-background.c.gnome-bg 2007-08-22 17:19:12.000000000 -0400
++++ gnome-control-center-2.21.4/gnome-settings-daemon/gnome-settings-background.c 2007-12-21 12:14:44.000000000 -0500
@@ -30,11 +30,13 @@
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
--- control-center-2.19.91-default-apps.patch DELETED ---
More information about the fedora-extras-commits
mailing list