rpms/gnome-panel/devel gnome-panel.spec, 1.340, 1.341 preferred-apps.patch, 1.10, 1.11

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-panel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23820

Modified Files:
	gnome-panel.spec preferred-apps.patch 
Log Message:
no more www.s.com 



Index: gnome-panel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/gnome-panel.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- gnome-panel.spec	16 Jan 2009 18:40:26 -0000	1.340
+++ gnome-panel.spec	16 Jan 2009 19:26:05 -0000	1.341
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.25.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-panel/2.25/%{name}-%{version}.tar.bz2
 
@@ -373,6 +373,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-4
+- And don't write %s into desktop files
+
 * Fri Jan 16 2009 Matthias Clasen <mclasen at redhat.com> - 2.25.3-3
 - Fix the 'smart launcher' patch
 

preferred-apps.patch:

Index: preferred-apps.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-panel/devel/preferred-apps.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- preferred-apps.patch	16 Jan 2009 18:32:26 -0000	1.10
+++ preferred-apps.patch	16 Jan 2009 19:26:05 -0000	1.11
@@ -1,6 +1,6 @@
 diff -up gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps gnome-panel-2.25.3/gnome-panel/launcher.c
---- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps	2009-01-16 13:27:30.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/launcher.c	2009-01-16 13:31:07.000000000 -0500
+--- gnome-panel-2.25.3/gnome-panel/launcher.c.preferred-apps	2009-01-16 14:15:17.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.c	2009-01-16 14:24:06.000000000 -0500
 @@ -21,6 +21,7 @@
  #include <glib/gi18n.h>
  #include <gio/gio.h>
@@ -17,7 +17,7 @@
  
  static GdkScreen *
  launcher_get_screen (Launcher *launcher)
-@@ -1215,3 +1217,178 @@ panel_launcher_set_dnd_enabled (Launcher
+@@ -1215,3 +1217,189 @@ panel_launcher_set_dnd_enabled (Launcher
  	} else
  		gtk_drag_source_unset (launcher->button);
  }
@@ -93,6 +93,17 @@
 +			g_key_file_set_string (key_file, "Desktop Entry", "GenericName", "Web Browser");
 +			g_key_file_set_string (key_file, "Desktop Entry", "Comment", "Browse the Web");
 +			g_key_file_set_string (key_file, "Desktop Entry", "Icon", "redhat-web-browser.png");
++			if (strstr (exec, "%s")) {
++				gchar *exec2, *s;
++
++				exec2 = g_strdup (exec);
++				s = strstr (exec2, "%s");
++				s[1] = 'u';
++
++				g_key_file_set_string (key_file, "Desktop Entry", "Exec", exec2);
++				g_free (exec2);
++				
++			}
 +		}
 +		else if (strstr (key, "mailto")) {
 +			g_key_file_set_string (key_file, "Desktop Entry", "Name", "Preferred Mail Reader");
@@ -172,7 +183,7 @@
 +	client = panel_gconf_get_client ();
 +
 +	gconf_client_add_dir (client,
-+			      "desktop/gnome/url-handlers",
++			      "/desktop/gnome/url-handlers",
 +			      GCONF_CLIENT_PRELOAD_NONE,
 +			      NULL);
 +
@@ -197,8 +208,8 @@
 +	}
 +}
 diff -up gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps gnome-panel-2.25.3/gnome-panel/launcher.h
---- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps	2009-01-16 13:27:30.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/launcher.h	2009-01-16 13:27:30.000000000 -0500
+--- gnome-panel-2.25.3/gnome-panel/launcher.h.preferred-apps	2009-01-16 14:15:17.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/launcher.h	2009-01-16 14:15:17.000000000 -0500
 @@ -14,6 +14,8 @@
  #include "applet.h"
  #include "panel-widget.h"
@@ -218,7 +229,7 @@
  
 diff -up gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps gnome-panel-2.25.3/gnome-panel/main.c
 --- gnome-panel-2.25.3/gnome-panel/main.c.preferred-apps	2008-12-09 07:32:37.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/main.c	2009-01-16 13:27:30.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/main.c	2009-01-16 14:15:17.000000000 -0500
 @@ -27,6 +27,7 @@
  #include "panel-action-protocol.h"
  #include "panel-lockdown.h"
@@ -237,7 +248,7 @@
  	panel_profile_load ();
 diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c
 --- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c.preferred-apps	2008-12-11 12:03:03.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c	2009-01-16 13:27:30.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.c	2009-01-16 14:15:17.000000000 -0500
 @@ -789,7 +789,7 @@ get_all_applications_from_dir (GMenuTree
  	return list;
  }
@@ -249,7 +260,7 @@
  	GMenuTree          *tree;
 diff -up gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h
 --- gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h.preferred-apps	2008-11-08 19:27:01.000000000 -0500
-+++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h	2009-01-16 13:27:30.000000000 -0500
++++ gnome-panel-2.25.3/gnome-panel/panel-run-dialog.h	2009-01-16 14:15:17.000000000 -0500
 @@ -32,6 +32,8 @@ G_BEGIN_DECLS
  void panel_run_dialog_present           (GdkScreen  *screen,
  					 guint32    activate_time);