gnome-session r4838 - in branches/dbus_based: . gnome-session

[mccann svn gnome org]

Author: mccann
Date: Fri Jul 25 01:17:27 2008
New Revision: 4838
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4838&view=rev

Log:
2008-07-24  William Jon McCann  <jmccann redhat com>

	* gnome-session/gsm-autostart-app.c
	(gsm_autostart_app_set_desktop_filename), (start_notify):
	Make sure error is initialized.

	* gnome-session/gsm-manager.c (get_caller_info):
	Move variable initialization.




Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/gnome-session/gsm-autostart-app.c
   branches/dbus_based/gnome-session/gsm-manager.c

Modified: branches/dbus_based/gnome-session/gsm-autostart-app.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-autostart-app.c	(original)
+++ branches/dbus_based/gnome-session/gsm-autostart-app.c	Fri Jul 25 01:17:27 2008
@@ -168,6 +168,7 @@
 
         app->priv->desktop_id = g_path_get_basename (desktop_filename);
 
+        error = NULL;
         app->priv->desktop_file = egg_desktop_file_new (desktop_filename, &error);
         if (app->priv->desktop_file == NULL) {
                 g_warning ("Could not parse desktop file %s: %s",
@@ -627,6 +628,7 @@
         gboolean res;
         GError  *error;
 
+        error = NULL;
         res = dbus_g_proxy_end_call (proxy,
                                      call,
                                      &error,

Modified: branches/dbus_based/gnome-session/gsm-manager.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-manager.c	(original)
+++ branches/dbus_based/gnome-session/gsm-manager.c	Fri Jul 25 01:17:27 2008
@@ -2395,7 +2395,7 @@
 {
         gboolean res;
         gboolean ret;
-        GError  *error = NULL;
+        GError  *error;
 
         ret = FALSE;
 
@@ -2403,6 +2403,7 @@
                 goto out;
         }
 
+        error = NULL;
         res = dbus_g_proxy_call (manager->priv->bus_proxy,
                                  "GetConnectionUnixUser",
                                  &error,