Attachment 57430 Details for Bug 133942

[patch] Exec entry with params patch

X-KDE-SubstituteUID.dif (text/plain), 3.18 KB, created by Scott Reeves on 2005-11-16 00:41:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Scott Reeves

Created: 2005-11-16 00:41:36 UTC

Size: 3.18 KB

patch

obsolete

>diff -ruN gnome-desktop-2.4.1.1/libgnome-desktop/gnome-desktop-item.c gnome-desktop-n/libgnome-desktop/gnome-desktop-item.c
>--- gnome-desktop-2.4.1.1/libgnome-desktop/gnome-desktop-item.c	2003-10-15 14:53:14.000000000 +0200
>+++ gnome-desktop-n/libgnome-desktop/gnome-desktop-item.c	2004-03-31 11:08:47.000000000 +0200
>@@ -1922,58 +1922,72 @@
> 		int                           workspace,
> 		char                        **envp,
> 		GError                      **error)
> {
>+	char *to_free = NULL;
> 	const char *exec;
> 	char *the_exec;
> 	int ret;
> 
> 	exec = gnome_desktop_item_get_string (item, GNOME_DESKTOP_ITEM_EXEC);
>+	if ( gnome_desktop_item_get_boolean (item, GNOME_DESKTOP_ITEM_SUBSTITUTEUID)==TRUE) {
>+		exec = to_free = g_strdup_printf ("gnomesu -c \"%s\"", exec);
>+	} else if ( gnome_desktop_item_get_boolean (item, GNOME_DESKTOP_ITEM_ROOT_ONLY)==TRUE) {
>+		exec = to_free = g_strdup_printf ("gnomesu -c \"%s\"", exec);
>+	}; 
>+		
> 	/* This is a URL, so launch it as a url */
> 	if (item->type == GNOME_DESKTOP_ITEM_TYPE_LINK) {
> 		const char *url;
> 		url = gnome_desktop_item_get_string (item, GNOME_DESKTOP_ITEM_URL);
> 		if (url && url[0] != '\0') {
>+			g_free (to_free);
> 			if (gnome_url_show (url, error))
> 				return 0;
> 			else
> 				return -1;
> 		/* Gnome panel used to put this in Exec */
> 		} else if (exec && exec[0] != '\0') {
>-			if (gnome_url_show (exec, error))
>+			if (gnome_url_show (exec, error)) {
>+				g_free (to_free);
> 				return 0;
>-			else
>+			} else {
>+				g_free (to_free);
> 				return -1;
>+			}
> 		} else {
>+			g_free (to_free);
> 			g_set_error (error,
> 				     GNOME_DESKTOP_ITEM_ERROR,
> 				     GNOME_DESKTOP_ITEM_ERROR_NO_URL,
> 				     _("No URL to launch"));
> 			return -1;
> 		}
> 	}
> 
> 	/* check the type, if there is one set */
> 	if (item->type != GNOME_DESKTOP_ITEM_TYPE_APPLICATION) {
>+		g_free (to_free);
> 		g_set_error (error,
> 			     GNOME_DESKTOP_ITEM_ERROR,
> 			     GNOME_DESKTOP_ITEM_ERROR_NOT_LAUNCHABLE,
> 			     _("Not a launchable item"));
> 		return -1;
> 	}
> 
> 
> 	if (exec == NULL ||
> 	    exec[0] == '\0') {
> 		g_set_error (error,
> 			     GNOME_DESKTOP_ITEM_ERROR,
> 			     GNOME_DESKTOP_ITEM_ERROR_NO_EXEC_STRING,
> 			     _("No command (Exec) to launch"));
> 		return -1;
> 	}
> 
> 
> 	/* make a new copy and get rid of spaces */
> 	the_exec = g_alloca (strlen (exec) + 1);
> 	strcpy (the_exec, exec);
>+	g_free (to_free);
> 
> 	if ( ! strip_the_amp (the_exec)) {
>diff -ruN gnome-desktop-2.4.1.1/libgnome-desktop/gnome-desktop-item.h gnome-desktop-n/libgnome-desktop/gnome-desktop-item.h
>--- gnome-desktop-2.4.1.1/libgnome-desktop/libgnome/gnome-desktop-item.h	2002-11-28 12:38:41.000000000 +0100
>+++ gnome-desktop-n/libgnome-desktop/libgnome/gnome-desktop-item.h	2004-03-31 11:06:29.000000000 +0200
>@@ -95,7 +95,8 @@
> #define GNOME_DESKTOP_ITEM_SORT_ORDER	"SortOrder" /* strings */
> #define GNOME_DESKTOP_ITEM_URL		"URL" /* string */
> #define GNOME_DESKTOP_ITEM_DOC_PATH	"X-GNOME-DocPath" /* string */
>-
>+#define GNOME_DESKTOP_ITEM_SUBSTITUTEUID "X-KDE-SubstituteUID" /*boolean*/
>+#define GNOME_DESKTOP_ITEM_ROOT_ONLY     "X-KDE-RootOnly" /*boolean*/
> /* The vfolder proposal */
> #define GNOME_DESKTOP_ITEM_CATEGORIES	"Categories" /* string */
> #define GNOME_DESKTOP_ITEM_ONLY_SHOW_IN	"OnlyShowIn" /* string */

Actions: View | Diff

Attachments on bug 133942: 57430