Hello community, here is the log from the commit of package gnome-desktop checked in at Wed Sep 13 02:10:38 CEST 2006. -------- --- GNOME/gnome-desktop/gnome-desktop.changes 2006-08-30 18:12:19.000000000 +0200 +++ gnome-desktop/gnome-desktop.changes 2006-09-12 20:05:19.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 12 20:04:35 CEST 2006 - danw@suse.de + +- update X-KDE-SubstituteUID.dif for 2.15 and re-enable it. #202076 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-desktop.spec ++++++ --- /var/tmp/diff_new_pack.t0xpHW/_old 2006-09-13 02:10:21.000000000 +0200 +++ /var/tmp/diff_new_pack.t0xpHW/_new 2006-09-13 02:10:21.000000000 +0200 @@ -20,17 +20,15 @@ Autoreqprov: on Obsoletes: gnome-core Version: 2.15.92 -Release: 2 +Release: 4 Summary: The GNOME Desktop API Library Source: gnome-desktop-%{version}.tar.bz2 Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch: icon-search-path.dif Patch1: X-KDE-SubstituteUID.dif -#Patch2: gnome-desktop-ximian-menus.patch -#Patch3: menu-item-delete-crash.diff -Patch4: gnome-desktop-desktop.patch -Patch5: gnome-desktop-recently-used-apps.patch +Patch2: gnome-desktop-desktop.patch +Patch3: gnome-desktop-recently-used-apps.patch %description This package contains the libgnome-desktop library that contains APIs @@ -67,11 +65,9 @@ %prep %setup -n gnome-desktop-%{version} %patch -p1 -#%patch1 -p1 -#%patch2 -p1 -#%patch3 -%patch4 -p1 -%patch5 +%patch1 +%patch2 -p1 +%patch3 %build autoreconf -f -i @@ -133,6 +129,8 @@ %{prefix}/include/gnome-desktop-2.0 %changelog -n gnome-desktop +* Tue Sep 12 2006 - danw@suse.de +- update X-KDE-SubstituteUID.dif for 2.15 and re-enable it. #202076 * Wed Aug 30 2006 - jhargadon@suse.de - update to version 2.15.92 - Remove gnome-workspace icon ++++++ X-KDE-SubstituteUID.dif ++++++ --- /var/tmp/diff_new_pack.t0xpHW/_old 2006-09-13 02:10:21.000000000 +0200 +++ /var/tmp/diff_new_pack.t0xpHW/_new 2006-09-13 02:10:22.000000000 +0200 @@ -1,85 +1,29 @@ -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 -- %s", exec); -+ } else if ( gnome_desktop_item_get_boolean (item, GNOME_DESKTOP_ITEM_ROOT_ONLY)==TRUE) { -+ exec = to_free = g_strdup_printf ("gnomesu -- %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; - } +Index: libgnome-desktop/gnome-desktop-item.c +================================================================================ +--- libgnome-desktop/gnome-desktop-item.c ++++ libgnome-desktop/gnome-desktop-item.c +@@ -2085,8 +2085,16 @@ /* make a new copy and get rid of spaces */ - the_exec = g_alloca (strlen (exec) + 1); - strcpy (the_exec, exec); -+ g_free (to_free); +- the_exec = g_alloca (strlen (exec) + 1); +- strcpy (the_exec, exec); ++ ++ if (gnome_desktop_item_get_boolean (item, GNOME_DESKTOP_ITEM_SUBSTITUTEUID) || ++ gnome_desktop_item_get_boolean (item, GNOME_DESKTOP_ITEM_ROOT_ONLY)) { ++ the_exec = g_alloca (strlen (exec) + sizeof ("gnomesu -- ")); ++ strcpy (the_exec, "gnomesu -- "); ++ strcat (the_exec, exec); ++ } else { ++ the_exec = g_alloca (strlen (exec) + 1); ++ strcpy (the_exec, exec); ++ } 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 @@ + g_set_error (error, +--- libgnome-desktop/libgnome/gnome-desktop-item.h ++++ libgnome-desktop/libgnome/gnome-desktop-item.h +@@ -96,7 +96,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 */ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org