rpms/control-center/devel control-center-2.19.91-default-apps.patch, NONE, 1.1 control-center.spec, 1.299, 1.300 gnome-bg.patch, 1.2, 1.3 control-center-2.19.1-default-apps.patch, 1.1, NONE
Bastien Nocera (hadess)
fedora-extras-commits at redhat.com
Thu Aug 30 09:14:24 UTC 2007
Author: hadess
Update of /cvs/pkgs/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15587
Modified Files:
control-center.spec gnome-bg.patch
Added Files:
control-center-2.19.91-default-apps.patch
Removed Files:
control-center-2.19.1-default-apps.patch
Log Message:
Update the background and the default-apps patches
control-center-2.19.91-default-apps.patch:
--- NEW FILE control-center-2.19.91-default-apps.patch ---
--- gnome-control-center-2.19.91/capplets/default-applications/gnome-default-applications.xml.in.default-apps 2007-08-21 13:00:36.000000000 +0100
+++ gnome-control-center-2.19.91/capplets/default-applications/gnome-default-applications.xml.in 2007-08-30 10:09:54.000000000 +0100
@@ -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>
@@ -167,51 +113,9 @@
<mail-readers>
<mail-reader>
- <_name>Evolution Mail Reader 2.4</_name>
- <executable>evolution-2.4</executable>
- <command>evolution-2.4 %s</command>
- <icon-name>evolution</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Evolution Mail Reader 2.2</_name>
- <executable>evolution-2.2</executable>
- <command>evolution-2.2 %s</command>
- <icon-name>evolution</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Evolution Mail Reader 2.0</_name>
- <executable>evolution-2.0</executable>
- <command>evolution-2.0 %s</command>
- <icon-name>evolution</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Evolution Mail Reader 1.6</_name>
- <executable>evolution-1.6</executable>
- <command>evolution-1.6 %s</command>
- <icon-name>evolution</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Evolution Mail Reader 1.5</_name>
- <executable>evolution-1.5</executable>
- <command>evolution-1.5 %s</command>
- <icon-name>evolution</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <mail-reader>
- <_name>Evolution Mail Reader 1.4</_name>
- <executable>evolution-1.4</executable>
- <command>evolution-1.4 %s</command>
- <icon-name>evolution</icon-name>
- <run-in-terminal>false</run-in-terminal>
- </mail-reader>
- <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>
@@ -237,27 +141,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>
@@ -286,6 +176,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>
@@ -310,6 +207,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/pkgs/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -r1.299 -r1.300
--- control-center.spec 30 Aug 2007 08:45:16 -0000 1.299
+++ control-center.spec 30 Aug 2007 09:13:51 -0000 1.300
@@ -71,7 +71,7 @@
#Patch98: control-center-2.9.4-filesel.patch
# change default preferred apps to programs we ship
-Patch99: control-center-2.19.1-default-apps.patch
+Patch99: control-center-2.19.91-default-apps.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.gnome.org
@@ -389,6 +389,7 @@
%changelog
* Thu Aug 30 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.91.-1
- Update to 2.19.91
+- Update the background and the default-apps patches
* Mon Aug 20 2007 - Bastien Nocera <bnocera at redhat.com> - 2.19.90-4
- Kill some shell warnings (#239439)
gnome-bg.patch:
Index: gnome-bg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/control-center/devel/gnome-bg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-bg.patch 17 Aug 2007 16:25:59 -0000 1.2
+++ gnome-bg.patch 30 Aug 2007 09:13:51 -0000 1.3
@@ -462,7 +462,7 @@
}
void gnome_wp_item_update_description (GnomeWPItem * item) {
-@@ -356,16 +237,22 @@ void gnome_wp_item_update_description (G
+@@ -356,6 +237,12 @@ void gnome_wp_item_update_description (G
if (!strcmp (item->filename, "(none)")) {
item->description = g_strdup (item->name);
} else {
@@ -471,14 +471,11 @@
+ if (strcmp (item->fileinfo->mime_type, "application/xml") == 0)
+ description = _("Slide show");
+ else
-+ description = gnome_vfs_mime_get_description (item->fileinfo->mime_type);
++ description = gnome_vfs_mime_get_description (item->fileinfo->mime_type);
+ gchar *dirname = g_path_get_dirname (item->filename);
/* translators: <b>wallpaper name</b>
* mime type, x pixel(s) by y pixel(s)
- * Folder: /path/to/file
- */
- item->description =
-- g_markup_printf_escaped (_("<b>%s</b>\n"
-+ g_markup_printf_escaped (_("<b>%s</b>\n"
+@@ -366,7 +253,7 @@ void gnome_wp_item_update_description (G
"%s, %d %s by %d %s\n"
"Folder: %s"),
item->name,
@@ -486,7 +483,7 @@
+ description,
item->width,
ngettext ("pixel", "pixels", item->width),
- item->height,
+
diff -up gnome-control-center-2.19.90/gnome-settings-daemon/gnome-settings-background.c.gnome-bg gnome-control-center-2.19.90/gnome-settings-daemon/gnome-settings-background.c
--- gnome-control-center-2.19.90/gnome-settings-daemon/gnome-settings-background.c.gnome-bg 2007-07-02 08:30:05.000000000 -0400
+++ gnome-control-center-2.19.90/gnome-settings-daemon/gnome-settings-background.c 2007-08-17 10:09:20.000000000 -0400
--- control-center-2.19.1-default-apps.patch DELETED ---
More information about the fedora-extras-commits
mailing list