r19560 - /desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Apr 12 12:48:58 UTC 2009


Author: joss
Date: Sun Apr 12 12:48:58 2009
New Revision: 19560

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19560
Log:
Add a pair of missing functions to gnome-panel-logout.

Modified:
    desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch

Modified: desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch?rev=19560&op=diff
==============================================================================
--- desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch (original)
+++ desktop/experimental/gnome-panel/debian/patches/04_gnome-panel-logout.patch Sun Apr 12 12:48:58 2009
@@ -1,7 +1,7 @@
 Index: gnome-panel-2.26.0/configure.in
 ===================================================================
---- gnome-panel-2.26.0.orig/configure.in	2009-03-16 23:40:12.000000000 +0100
-+++ gnome-panel-2.26.0/configure.in	2009-04-12 14:28:08.418477753 +0200
+--- gnome-panel-2.26.0.orig/configure.in	2009-04-12 14:35:06.786483812 +0200
++++ gnome-panel-2.26.0/configure.in	2009-04-12 14:43:25.718480057 +0200
 @@ -74,6 +74,10 @@ PKG_CHECK_MODULES(PANEL, ORBit-2.0 >= $O
  AC_SUBST(PANEL_CFLAGS)
  AC_SUBST(PANEL_LIBS)
@@ -15,8 +15,8 @@
  AC_SUBST(LIBPANEL_APPLET_LIBS)
 Index: gnome-panel-2.26.0/gnome-panel/Makefile.am
 ===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/Makefile.am	2009-04-12 14:11:25.726478560 +0200
-+++ gnome-panel-2.26.0/gnome-panel/Makefile.am	2009-04-12 14:25:58.477980497 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/Makefile.am	2009-04-12 14:43:25.646479425 +0200
++++ gnome-panel-2.26.0/gnome-panel/Makefile.am	2009-04-12 14:43:25.718480057 +0200
 @@ -31,6 +31,7 @@ STANDARD_PROPERTIES_CFLAGS = 					\
  
  bin_PROGRAMS = \
@@ -52,7 +52,7 @@
 Index: gnome-panel-2.26.0/gnome-panel/gnome-panel-logout.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gnome-panel-2.26.0/gnome-panel/gnome-panel-logout.c	2009-04-12 14:25:58.477980497 +0200
++++ gnome-panel-2.26.0/gnome-panel/gnome-panel-logout.c	2009-04-12 14:43:25.718480057 +0200
 @@ -0,0 +1,49 @@
 +/* GNOME panel : logout/shutdown request standalone binary
 + *
@@ -105,8 +105,8 @@
 +}
 Index: gnome-panel-2.26.0/gnome-panel/panel-logout.c
 ===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-logout.c	2009-04-12 14:24:58.793980784 +0200
-+++ gnome-panel-2.26.0/gnome-panel/panel-logout.c	2009-04-12 14:25:58.477980497 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-logout.c	2009-04-12 14:43:25.682480230 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-logout.c	2009-04-12 14:43:25.718480057 +0200
 @@ -182,8 +182,6 @@ panel_logout_response (PanelLogoutDialog
  	gtk_widget_destroy (GTK_WIDGET (logout_dialog));
  
@@ -160,8 +160,8 @@
  }
 Index: gnome-panel-2.26.0/gnome-panel/panel-session.c
 ===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-session.c	2009-04-12 14:11:25.726478560 +0200
-+++ gnome-panel-2.26.0/gnome-panel/panel-session.c	2009-04-12 14:30:55.690483483 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-session.c	2009-04-12 14:43:25.646479425 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-session.c	2009-04-12 14:43:25.722480146 +0200
 @@ -28,7 +28,9 @@
  
  #include <stdlib.h>
@@ -187,8 +187,8 @@
 +#endif // BUILDING_STANDALONE_LOGOUT
 Index: gnome-panel-2.26.0/gnome-panel/panel-util.c
 ===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-util.c	2009-03-16 23:37:11.000000000 +0100
-+++ gnome-panel-2.26.0/gnome-panel/panel-util.c	2009-04-12 14:29:58.434482789 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-util.c	2009-04-12 14:35:06.582479741 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-util.c	2009-04-12 14:48:06.769979968 +0200
 @@ -33,6 +33,7 @@
  #include <libpanel-util/panel-glib.h>
  #include <libpanel-util/panel-keyfile.h>
@@ -217,13 +217,13 @@
  
  gboolean
  panel_is_program_in_path (const char *program)
-@@ -145,6 +150,7 @@ panel_is_program_in_path (const char *pr
- 	}
- }
- 
-+#ifndef BUILDING_STANDALONE_LOGOUT
- static gboolean
- panel_ensure_dir (const char *dirname)
+@@ -185,6 +190,7 @@ panel_ensure_dir (const char *dirname)
+ 	return TRUE;
+ }
+ 
++#ifndef BUILDING_STANDALONE_LOGOUT
+ gboolean
+ panel_is_uri_writable (const char *uri)
  {
 @@ -341,6 +347,7 @@ panel_load_icon (GtkIconTheme  *icon_the
  
@@ -273,15 +273,31 @@
  char *
  panel_launcher_get_uri (const char *location)
  {
-@@ -1216,3 +1228,4 @@ panel_util_get_file_optional_homedir (co
+@@ -541,6 +553,7 @@ panel_launcher_get_filename (const char 
+ 
+ 	return retval;
+ }
++#endif /* BUILDING_STANDALONE_LOGOUT */
+ 
+ char *
+ panel_make_full_path (const char *dir,
+@@ -567,6 +580,7 @@ panel_make_full_path (const char *dir,
+ 	return retval;
+ }
+ 
++#ifndef BUILDING_STANDALONE_LOGOUT
+ char *
+ panel_make_unique_desktop_path_from_name (const char *dir,
+ 					  const char *name)
+@@ -1216,3 +1230,4 @@ panel_util_get_file_optional_homedir (co
  
  	return file;
  }
 +#endif // BUILDING_STANDALONE_LOGOUT
 Index: gnome-panel-2.26.0/gnome-panel/panel-lockdown.c
 ===================================================================
---- gnome-panel-2.26.0.orig/gnome-panel/panel-lockdown.c	2009-03-16 23:37:12.000000000 +0100
-+++ gnome-panel-2.26.0/gnome-panel/panel-lockdown.c	2009-04-12 14:25:58.481980098 +0200
+--- gnome-panel-2.26.0.orig/gnome-panel/panel-lockdown.c	2009-04-12 14:35:06.550480493 +0200
++++ gnome-panel-2.26.0/gnome-panel/panel-lockdown.c	2009-04-12 14:43:25.722480146 +0200
 @@ -26,10 +26,14 @@
  
  #include "panel-lockdown.h"




More information about the pkg-gnome-commits mailing list