File gnome-packagekit-BNC437977.patch of Package gnome-packagekit

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-packagekit-BNC437977.patch of Package gnome-packagekit

Index: gnome-packagekit-0.3.14/src/gpk-gnome.c
===================================================================
--- gnome-packagekit-0.3.14.orig/src/gpk-gnome.c
+++ gnome-packagekit-0.3.14/src/gpk-gnome.c
@@ -55,40 +55,17 @@ gboolean
 gpk_gnome_help (const gchar *link_id)
 {
 	GError *error = NULL;
-	gchar *command;
-	const gchar *lang;
-	gchar *uri = NULL;
-	GdkScreen *gscreen;
-	gint i;
-	gboolean ret = TRUE;
-	gboolean found_help_file = FALSE;
-	const gchar *const *langs = g_get_language_names ();
-
-	for (i = 0; langs[i]; i++) {
-		lang = langs[i];
-		if (strchr (lang, '.'))
-			continue;
-		uri = g_build_filename (DATADIR, "/gnome/help/gnome-packagekit/",
-					lang, "/gnome-packagekit.xml", NULL);
-		if (g_file_test (uri, G_FILE_TEST_EXISTS)) {
-			found_help_file = TRUE;
-			break;
-		}
-		g_free (uri);
-	}
-	if (!found_help_file) {
-		egg_warning ("cant find help file");
-		return FALSE;
-	}
+	gchar * uri;
+	gboolean ret;
 
 	if (link_id)
-		command = g_strconcat ("gnome-open ghelp://", uri, "?", link_id, NULL);
+		uri = g_strconcat ("ghelp:gnome-packagekit", "?", link_id, NULL);
 	else
-		command = g_strconcat ("gnome-open ghelp://", uri, NULL);
-	egg_debug ("using command %s", command);
+		uri = g_strconcat ("ghelp:gnome-packagekit", NULL);
 
-	gscreen = gdk_screen_get_default ();
-	gdk_spawn_command_line_on_screen (gscreen, command, &error);
+	//TODO: it would be nice to pass in the screen and timestamp from all callers of this method
+	ret = gtk_show_uri (NULL, uri, gtk_get_current_event_time (), &error);
+	g_free (uri);
 	if (error != NULL) {
 		GtkWidget *d;
 		d = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -99,8 +76,6 @@ gpk_gnome_help (const gchar *link_id)
 		ret = FALSE;
 	}
 
-	g_free (command);
-	g_free (uri);
 	return ret;
 }
 
Index: gnome-packagekit-0.3.14/src/gpk-update-icon.c
===================================================================
--- gnome-packagekit-0.3.14.orig/src/gpk-update-icon.c
+++ gnome-packagekit-0.3.14/src/gpk-update-icon.c
@@ -229,7 +229,6 @@ main (int argc, char *argv[])
 		g_thread_init (NULL);
 	dbus_g_thread_init ();
 	g_type_init ();
-	notify_init ("gpk-update-icon");
 
 	/* TRANSLATORS: program name, a session wide daemon to watch for updates and changing system state */
 	g_set_application_name (_("Update Applet"));
@@ -250,9 +249,10 @@ main (int argc, char *argv[])
 	/* TRANSLATORS: title to pass to to the user if there are not enough privs */
 	ret = gpk_check_privileged_user (_("Update applet"), FALSE);
 	if (!ret) {
-		egg_warning ("Exit: gpk_check_privileged_user returned FALSE");
+		g_print ("Exit: gpk_check_privileged_user returned FALSE\n");
 		return 1;
 	}
+	notify_init ("gpk-update-icon");
 
 	g_timeout_add_seconds (5 * 60, check_for_collect_hardware_information, NULL);

Places

File gnome-packagekit-BNC437977.patch of Package gnome-packagekit

Places