Attachment 188152 Details for Bug 184735

[patch] Updated patch

gnome-main-menu-bnc184735-fix.patch (text/plain), 3.83 KB, created by Forgotten User CRPsQFwJ3b on 2007-12-19 00:35:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User CRPsQFwJ3b

Created: 2007-12-19 00:35:05 UTC

Size: 3.83 KB

patch

obsolete

>Index: libslab/application-tile.c
>===================================================================
>--- libslab/application-tile.c	(revision 370)
>+++ libslab/application-tile.c	(working copy)
>@@ -291,12 +291,14 @@
> 
> 	const gchar *name;
> 	const gchar *desc;
>+	gchar *package_name;
> 
> 	const gchar *comment;
> 
> 	const gchar *key;
> 	gchar *markup;
> 
>+	gboolean supports_package_management;
> 	/*Fixme - need to address the entire gconf key location issue */
> 	/*Fixme - this is just a temporary stop gap                   */
> 	gboolean use_new_prefix;
>@@ -412,41 +414,50 @@
> 		gtk_container_add (menu_ctnr, menu_item);
> 	}
> 
>-/* make upgrade action */
>-
>-	if (this->gconf_prefix && ! g_str_has_prefix (this->gconf_prefix, "/desktop/"))
>-		use_new_prefix = TRUE;
>+	package_name = get_package_name_from_desktop_item (priv->desktop_item);
>+	if (package_name != NULL)
>+		supports_package_management = TRUE;
> 	else
>-		use_new_prefix = FALSE;
>+		supports_package_management = FALSE;
> 
>-	if(!use_new_prefix)
>-		key = SLAB_UPGRADE_PACKAGE_KEY;
>-	else
>-		key = "/apps/main-menu/upgrade_package_command";
>-
>-	if (verify_package_management_command (key)) {
>-		action = tile_action_new (TILE (this), upgrade_trigger, _("Upgrade"), TILE_ACTION_OPENS_NEW_WINDOW);
>-		actions [APPLICATION_TILE_ACTION_UPGRADE_PACKAGE] = action;
>-		menu_item = GTK_WIDGET (tile_action_get_menu_item (action));
>-		gtk_container_add (menu_ctnr, menu_item);
>-	} else
>-		actions [APPLICATION_TILE_ACTION_UPGRADE_PACKAGE] = NULL;
>-
>+/* make upgrade action */
>+	if (supports_package_management) {
>+		if (this->gconf_prefix && ! g_str_has_prefix (this->gconf_prefix, "/desktop/"))
>+			use_new_prefix = TRUE;
>+		else
>+			use_new_prefix = FALSE;
>+		
>+		if(!use_new_prefix)
>+			key = SLAB_UPGRADE_PACKAGE_KEY;
>+		else
>+			key = "/apps/main-menu/upgrade_package_command";
>+		
>+		if (verify_package_management_command (key)) {
>+			action = tile_action_new (TILE (this), upgrade_trigger, _("Upgrade"), TILE_ACTION_OPENS_NEW_WINDOW);
>+			actions [APPLICATION_TILE_ACTION_UPGRADE_PACKAGE] = action;
>+			menu_item = GTK_WIDGET (tile_action_get_menu_item (action));
>+			gtk_container_add (menu_ctnr, menu_item);
>+		} else
>+			actions [APPLICATION_TILE_ACTION_UPGRADE_PACKAGE] = NULL;
>+    }
>+	
> /* make uninstall action */
> 
>-	if(!use_new_prefix)
>-		key = SLAB_UNINSTALL_PACKAGE_KEY;
>-	else
>-		key = "/apps/main-menu/uninstall_package_command";
>-
>-	if (verify_package_management_command (key)) {
>-		action = tile_action_new (TILE (this), uninstall_trigger, _("Uninstall"), TILE_ACTION_OPENS_NEW_WINDOW);
>-		actions [APPLICATION_TILE_ACTION_UNINSTALL_PACKAGE] = action;
>-		menu_item = GTK_WIDGET (tile_action_get_menu_item (action));
>-		gtk_container_add (menu_ctnr, menu_item);
>-	} else
>-		actions [APPLICATION_TILE_ACTION_UNINSTALL_PACKAGE] = NULL;
>-
>+	if (supports_package_management) {
>+		if(!use_new_prefix)
>+			key = SLAB_UNINSTALL_PACKAGE_KEY;
>+		else
>+			key = "/apps/main-menu/uninstall_package_command";
>+		
>+		if (verify_package_management_command (key)) {
>+			action = tile_action_new (TILE (this), uninstall_trigger, _("Uninstall"), TILE_ACTION_OPENS_NEW_WINDOW);
>+			actions [APPLICATION_TILE_ACTION_UNINSTALL_PACKAGE] = action;
>+			menu_item = GTK_WIDGET (tile_action_get_menu_item (action));
>+			gtk_container_add (menu_ctnr, menu_item);
>+		} else
>+			actions [APPLICATION_TILE_ACTION_UNINSTALL_PACKAGE] = NULL;
>+	}
>+	
> 	gtk_widget_show_all (GTK_WIDGET (TILE (this)->context_menu));
> }
> 
>Index: libslab/ChangeLog
>===================================================================
>--- libslab/ChangeLog	(revision 370)
>+++ libslab/ChangeLog	(working copy)
>@@ -1,3 +1,8 @@
>+2007-12-19  Ivan N. Zlatev  <contact@i-nz.net>
>+
>+	* application-tile.c: Use get_package_name_from_desktop_item
>+	to determine if the Install/Uninstall actions should be present.
>+
> 2007-09-16  Andre Klapper  <a9016009@gmx.de>
> 
> 	* system-tile.c: revert to svn revision 339 (=before

Actions: View | Diff

Attachments on bug 184735: 188149 | 188152