r14666 - in /desktop/unstable/gnome-session/debian: changelog patches/02_gsd-spawn.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Mon Feb 18 19:19:23 UTC 2008


Author: joss
Date: Mon Feb 18 19:19:23 2008
New Revision: 14666

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14666
Log:
* 02_gsd-spawn.patch: fix cosmetic issues asked by upstream.

Modified:
    desktop/unstable/gnome-session/debian/changelog
    desktop/unstable/gnome-session/debian/patches/02_gsd-spawn.patch

Modified: desktop/unstable/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/changelog?rev=14666&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/changelog (original)
+++ desktop/unstable/gnome-session/debian/changelog Mon Feb 18 19:19:23 2008
@@ -6,6 +6,9 @@
   [ Loic Minier ]
   * Update 02_gsd-spawn's header to give a bottom line explanation on the
     rationale for the change as I keep forgetting why we need tihs.
+
+  [ Josselin Mouette ]
+  * 02_gsd-spawn.patch: fix cosmetic issues asked by upstream.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 17 Feb 2008 11:00:42 +0100
 

Modified: desktop/unstable/gnome-session/debian/patches/02_gsd-spawn.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-session/debian/patches/02_gsd-spawn.patch?rev=14666&op=diff
==============================================================================
--- desktop/unstable/gnome-session/debian/patches/02_gsd-spawn.patch (original)
+++ desktop/unstable/gnome-session/debian/patches/02_gsd-spawn.patch Mon Feb 18 19:19:23 2008
@@ -13,7 +13,7 @@
 Index: gnome-session-2.20.3/configure.in
 ===================================================================
 --- gnome-session-2.20.3.orig/configure.in	2008-01-07 23:27:27.000000000 +0100
-+++ gnome-session-2.20.3/configure.in	2008-02-16 12:33:22.853111710 +0100
++++ gnome-session-2.20.3/configure.in	2008-02-18 20:13:07.496883704 +0100
 @@ -427,6 +427,20 @@ AC_ARG_WITH(rsh-command,
  ])
  AC_SUBST(RSH_COMMAND)
@@ -38,13 +38,12 @@
 Index: gnome-session-2.20.3/gnome-session/gsm-gsd.c
 ===================================================================
 --- gnome-session-2.20.3.orig/gnome-session/gsm-gsd.c	2008-01-07 23:27:23.000000000 +0100
-+++ gnome-session-2.20.3/gnome-session/gsm-gsd.c	2008-02-16 14:30:25.847273149 +0100
-@@ -8,12 +8,13 @@
- 
++++ gnome-session-2.20.3/gnome-session/gsm-gsd.c	2008-02-18 20:16:35.752884029 +0100
+@@ -9,11 +9,13 @@
  #include <dbus/dbus-glib-lowlevel.h>
  
--#include <gtk/gtkmessagedialog.h>
-+#include <gtk/gtk.h>
+ #include <gtk/gtkmessagedialog.h>
++#include <gtk/gtkmain.h>
  
  #include <gnome-settings-daemon/gnome-settings-client.h>
  
@@ -55,7 +54,7 @@
    gboolean     activating;
    time_t       start_time;
    guint        attempts;
-@@ -78,6 +79,8 @@ gsd_error_dialog (GnomeSettingsData *gsd
+@@ -78,6 +80,8 @@ gsd_error_dialog (GnomeSettingsData *gsd
    gtk_widget_show (dialog);
  }
  
@@ -64,7 +63,7 @@
  static void
  name_owner_changed (DBusGProxy *proxy,
                      const char *name,
-@@ -100,7 +103,7 @@ name_owner_changed (DBusGProxy *proxy,
+@@ -100,7 +104,7 @@ name_owner_changed (DBusGProxy *proxy,
  
                gsd->dbus_proxy = NULL;
  
@@ -73,7 +72,7 @@
              }
  	}
        else
-@@ -111,15 +114,29 @@ name_owner_changed (DBusGProxy *proxy,
+@@ -111,15 +115,29 @@ name_owner_changed (DBusGProxy *proxy,
      }
  }
  
@@ -97,7 +96,7 @@
    static GnomeSettingsData gsd = { NULL };
    time_t now;
    DBusGConnection *connection;
-+  DBusGProxy *dbusService;
++  DBusGProxy *dbus_service;
    GError *error = NULL;
 +  const gchar *const argv[] = { SETTINGS_DAEMON_PATH, "gnome-settings-daemon", NULL };
  
@@ -106,7 +105,7 @@
  
    if (gsd.activating)
      return;
-@@ -154,52 +171,74 @@ gsm_gsd_start (void)
+@@ -154,52 +172,74 @@ gsm_gsd_start (void)
        gsd_set_error (&gsd, error->message);
        gsd_error_dialog (&gsd, NULL);
        g_error_free (error);
@@ -148,17 +147,17 @@
 -                                                  "org.gnome.SettingsDaemon",
 -                                                  "/org/gnome/SettingsDaemon",
 -                                                  "org.gnome.SettingsDaemon");
-+  dbusService = dbus_g_proxy_new_for_name (connection,
++  dbus_service = dbus_g_proxy_new_for_name (connection,
 +                                           DBUS_SERVICE_DBUS,
 +                                           DBUS_PATH_DBUS,
 +                                           DBUS_INTERFACE_DBUS);
-+  dbus_g_proxy_add_signal (dbusService,
++  dbus_g_proxy_add_signal (dbus_service,
 +                           "NameOwnerChanged",
 +                           G_TYPE_STRING,
 +                           G_TYPE_STRING,
 +                           G_TYPE_STRING,
 +                           G_TYPE_INVALID);
-+  dbus_g_proxy_connect_signal (dbusService,
++  dbus_g_proxy_connect_signal (dbus_service,
 +                               "NameOwnerChanged",
 +                               G_CALLBACK (name_owner_changed),
 +                               &gsd,




More information about the pkg-gnome-commits mailing list