r11320 - in /desktop/unstable/gnome-panel/debian: changelog patches/06_gksu_time_admin.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Jun  6 19:29:14 2007
New Revision: 11320

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11320
Log:
* 06_gksu_time_admin.patch: check that the command called by gksu 
  exists (closes: #427714).

Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/patches/06_gksu_time_admin.patch

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=11320&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog (original)
+++ desktop/unstable/gnome-panel/debian/changelog Wed Jun  6 19:29:14 2007
@@ -1,3 +1,10 @@
+gnome-panel (2.18.2-2) UNRELEASED; urgency=low
+
+  * 06_gksu_time_admin.patch: check that the command called by gksu 
+    exists (closes: #427714).
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 06 Jun 2007 21:19:01 +0200
+
 gnome-panel (2.18.2-1) unstable; urgency=low
 
   * New upstream stable release; no API change.

Modified: desktop/unstable/gnome-panel/debian/patches/06_gksu_time_admin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/06_gksu_time_admin.patch?rev=11320&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/06_gksu_time_admin.patch (original)
+++ desktop/unstable/gnome-panel/debian/patches/06_gksu_time_admin.patch Wed Jun  6 19:29:14 2007
@@ -1,7 +1,6 @@
-diff -Nur gnome-panel-2.18.1/applets/clock/clock.c gnome-panel-2.18.1.new/applets/clock/clock.c
---- gnome-panel-2.18.1/applets/clock/clock.c	2007-05-09 17:03:24.000000000 +0200
-+++ gnome-panel-2.18.1.new/applets/clock/clock.c	2007-05-09 17:04:02.000000000 +0200
-@@ -85,7 +85,7 @@
+--- applets/clock/clock.c.orig	2007-04-10 21:16:57.000000000 +0200
++++ applets/clock/clock.c	2007-06-06 21:18:22.578395076 +0200
+@@ -84,7 +84,7 @@
  	"system-config-date",
  	"redhat-config-date",
          "/sbin/yast2 timezone",
@@ -10,3 +9,21 @@
  };
  
  /* Needs to match the indices in the combo */
+@@ -2201,8 +2201,16 @@
+                 g_strfreev (argv);
+                 return FALSE;
+         }
+-
+         g_free (path);
++
++        if (g_str_equal (argv[0], "gksu") && argv[1]) {
++                if (!(path = g_find_program_in_path (argv[1]))) {
++                        g_strfreev (argv);
++                        return FALSE;
++                }
++                g_free (path);
++        }
++
+         g_strfreev (argv);
+ 
+         return TRUE;