fix smart launchers

1 files changed, 41 insertions, 41 deletions

diff --git a/preferred-apps.patch b/preferred-apps.patch
index e1de0e5..b52e599 100644
--- a/preferred-apps.patch
+++ b/preferred-apps.patch
@@ -1,33 +1,6 @@
-Index: gnome-panel/panel-run-dialog.c
-===================================================================
---- gnome-panel/panel-run-dialog.c	(revision 11419)
-+++ gnome-panel/panel-run-dialog.c	(working copy)
-@@ -789,7 +789,7 @@
- 	return list;
- }
- 
--static GSList *
-+GSList *
- get_all_applications (void)
- {
- 	GMenuTree          *tree;
-Index: gnome-panel/panel-run-dialog.h
-===================================================================
---- gnome-panel/panel-run-dialog.h	(revision 11419)
-+++ gnome-panel/panel-run-dialog.h	(working copy)
-@@ -32,6 +32,8 @@
- void panel_run_dialog_present           (GdkScreen  *screen,
- 					 guint32    activate_time);
- 
-+GSList *get_all_applications           (void);
-+
- G_END_DECLS
- 
- #endif /* __PANEL_RUN_DIALOG_H__ */
-Index: gnome-panel/launcher.c
-===================================================================
---- gnome-panel/launcher.c	(revision 11419)
-+++ gnome-panel/launcher.c	(working copy)
+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
 @@ -21,6 +21,7 @@
  #include <glib/gi18n.h>
  #include <gio/gio.h>
@@ -44,7 +17,7 @@ Index: gnome-panel/launcher.c
  
  static GdkScreen *
  launcher_get_screen (Launcher *launcher)
-@@ -1110,3 +1112,173 @@
+@@ -1215,3 +1217,178 @@ panel_launcher_set_dnd_enabled (Launcher
  	} else
  		gtk_drag_source_unset (launcher->button);
  }
@@ -198,6 +171,11 @@ Index: gnome-panel/launcher.c
 +
 +	client = panel_gconf_get_client ();
 +
++	gconf_client_add_dir (client,
++			      "desktop/gnome/url-handlers",
++			      GCONF_CLIENT_PRELOAD_NONE,
++			      NULL);
++
 +	for (i = 0; keys[i]; i++) {
 +                dirname = g_build_filename (g_get_user_data_dir (), 
 +					    "applications", NULL);
@@ -218,10 +196,9 @@ Index: gnome-panel/launcher.c
 +					 filename, g_free, NULL);
 +	}
 +}
-Index: gnome-panel/launcher.h
-===================================================================
---- gnome-panel/launcher.h	(revision 11419)
-+++ gnome-panel/launcher.h	(working copy)
+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
 @@ -14,6 +14,8 @@
  #include "applet.h"
  #include "panel-widget.h"
@@ -231,7 +208,7 @@ Index: gnome-panel/launcher.h
  G_BEGIN_DECLS
  
  typedef struct {
-@@ -70,6 +72,7 @@
+@@ -71,6 +73,7 @@ void            launcher_properties_dest
  void            panel_launcher_set_dnd_enabled  (Launcher *launcher,
  						 gboolean  dnd_enabled);
  
@@ -239,10 +216,9 @@ Index: gnome-panel/launcher.h
  
  G_END_DECLS
  
-Index: gnome-panel/main.c
-===================================================================
---- gnome-panel/main.c	(revision 11419)
-+++ gnome-panel/main.c	(working copy)
+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
 @@ -27,6 +27,7 @@
  #include "panel-action-protocol.h"
  #include "panel-lockdown.h"
@@ -251,7 +227,7 @@ Index: gnome-panel/main.c
  #include "xstuff.h"
  
  #include "nothing.cP"
-@@ -86,6 +87,7 @@
+@@ -86,6 +87,7 @@ main (int argc, char **argv)
  			      GCONF_CLIENT_PRELOAD_NONE,
  			      NULL);
  
@@ -259,3 +235,27 @@ Index: gnome-panel/main.c
  	panel_global_config_load ();
  	panel_lockdown_init ();
  	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
+@@ -789,7 +789,7 @@ get_all_applications_from_dir (GMenuTree
+ 	return list;
+ }
+ 
+-static GSList *
++GSList *
+ get_all_applications (void)
+ {
+ 	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
+@@ -32,6 +32,8 @@ G_BEGIN_DECLS
+ void panel_run_dialog_present           (GdkScreen  *screen,
+ 					 guint32    activate_time);
+ 
++GSList *get_all_applications           (void);
++
+ G_END_DECLS
+ 
+ #endif /* __PANEL_RUN_DIALOG_H__ */