gdm r6011 - in trunk: . daemon gui/simple-chooser gui/simple-greeter utils
- From: mccann svn gnome org
- To: svn-commits-list gnome org
- Subject: gdm r6011 - in trunk: . daemon gui/simple-chooser gui/simple-greeter utils
- Date: Wed, 12 Mar 2008 16:17:59 +0000 (GMT)
Author: mccann
Date: Wed Mar 12 16:17:59 2008
New Revision: 6011
URL: http://svn.gnome.org/viewvc/gdm?rev=6011&view=rev
Log:
2008-03-12 William Jon McCann <jmccann redhat com>
* daemon/gdm-chooser-server.c: (handle_select_hostname),
(handle_disconnect), (do_introspect):
* daemon/gdm-product-slave.c: (send_dbus_string_method),
(send_dbus_void_method):
* daemon/gdm-session-worker.c: (send_dbus_string_method),
(send_dbus_int_method), (send_dbus_void_method):
* daemon/gdm-slave.c: (activate_session_id), (session_unlock):
* gui/simple-chooser/gdm-chooser-client.c:
(send_dbus_string_method), (send_dbus_void_method):
* gui/simple-greeter/gdm-greeter-client.c:
(send_dbus_string_method), (send_dbus_bool_method),
(send_dbus_void_method):
* gui/simple-greeter/gdm-greeter-session.c:
(send_dbus_string_method):
* gui/simple-greeter/gdm-user-manager.c: (activate_session_id):
* utils/gdmflexiserver.c: (create_transient_display),
(get_current_session_id), (get_seat_id_for_session),
(activate_session_id), (session_is_login_window),
(seat_can_activate_sessions):
Fix a few leaks and make sure we don't unref null replies.
Modified:
trunk/ChangeLog
trunk/daemon/gdm-chooser-server.c
trunk/daemon/gdm-product-slave.c
trunk/daemon/gdm-session-worker.c
trunk/daemon/gdm-slave.c
trunk/gui/simple-chooser/gdm-chooser-client.c
trunk/gui/simple-greeter/gdm-greeter-client.c
trunk/gui/simple-greeter/gdm-greeter-session.c
trunk/gui/simple-greeter/gdm-user-manager.c
trunk/utils/gdmflexiserver.c
Modified: trunk/daemon/gdm-chooser-server.c
==============================================================================
--- trunk/daemon/gdm-chooser-server.c (original)
+++ trunk/daemon/gdm-chooser-server.c Wed Mar 12 16:17:59 2008
@@ -131,7 +131,9 @@
reply = dbus_message_new_method_return (message);
dbus_connection_send (connection, reply, NULL);
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
g_signal_emit (chooser_server, signals [HOSTNAME_SELECTED], 0, text);
@@ -147,7 +149,9 @@
reply = dbus_message_new_method_return (message);
dbus_connection_send (connection, reply, NULL);
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
g_signal_emit (chooser_server, signals [DISCONNECTED], 0);
@@ -219,7 +223,9 @@
g_error ("No memory");
}
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
return DBUS_HANDLER_RESULT_HANDLED;
}
Modified: trunk/daemon/gdm-product-slave.c
==============================================================================
--- trunk/daemon/gdm-product-slave.c (original)
+++ trunk/daemon/gdm-product-slave.c Wed Mar 12 16:17:59 2008
@@ -139,7 +139,9 @@
error.message);
return FALSE;
}
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (connection);
return TRUE;
@@ -178,7 +180,9 @@
error.message);
return FALSE;
}
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (connection);
return TRUE;
Modified: trunk/daemon/gdm-session-worker.c
==============================================================================
--- trunk/daemon/gdm-session-worker.c (original)
+++ trunk/daemon/gdm-session-worker.c Wed Mar 12 16:17:59 2008
@@ -381,7 +381,9 @@
error.message);
return FALSE;
}
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (connection);
return TRUE;
@@ -418,7 +420,9 @@
-1,
&error);
dbus_message_unref (message);
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (connection);
if (dbus_error_is_set (&error)) {
@@ -456,7 +460,9 @@
-1,
&error);
dbus_message_unref (message);
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (connection);
if (dbus_error_is_set (&error)) {
Modified: trunk/daemon/gdm-slave.c
==============================================================================
--- trunk/daemon/gdm-slave.c (original)
+++ trunk/daemon/gdm-slave.c Wed Mar 12 16:17:59 2008
@@ -954,6 +954,7 @@
gboolean ret;
ret = FALSE;
+ reply = NULL;
dbus_error_init (&local_error);
message = dbus_message_new_method_call ("org.freedesktop.ConsoleKit",
@@ -986,6 +987,13 @@
ret = TRUE;
out:
+ if (message != NULL) {
+ dbus_message_unref (message);
+ }
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
+
return ret;
}
@@ -1012,7 +1020,9 @@
message,
-1, &error);
dbus_message_unref (message);
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (dbus_g_connection_get_connection (slave->priv->connection));
if (dbus_error_is_set (&error)) {
Modified: trunk/gui/simple-chooser/gdm-chooser-client.c
==============================================================================
--- trunk/gui/simple-chooser/gdm-chooser-client.c (original)
+++ trunk/gui/simple-chooser/gdm-chooser-client.c Wed Mar 12 16:17:59 2008
@@ -119,7 +119,9 @@
error.message);
return FALSE;
}
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (connection);
return TRUE;
@@ -159,7 +161,9 @@
error.message);
return FALSE;
}
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (connection);
return TRUE;
Modified: trunk/gui/simple-greeter/gdm-greeter-client.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-client.c (original)
+++ trunk/gui/simple-greeter/gdm-greeter-client.c Wed Mar 12 16:17:59 2008
@@ -293,7 +293,9 @@
error.message);
return FALSE;
}
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (connection);
return TRUE;
@@ -339,7 +341,9 @@
error.message);
return FALSE;
}
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (connection);
return TRUE;
@@ -378,7 +382,9 @@
error.message);
return FALSE;
}
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (connection);
return TRUE;
Modified: trunk/gui/simple-greeter/gdm-greeter-session.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-greeter-session.c (original)
+++ trunk/gui/simple-greeter/gdm-greeter-session.c Wed Mar 12 16:17:59 2008
@@ -595,7 +595,9 @@
error.message);
return FALSE;
}
- dbus_message_unref (reply);
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
dbus_connection_flush (connection);
return TRUE;
Modified: trunk/gui/simple-greeter/gdm-user-manager.c
==============================================================================
--- trunk/gui/simple-greeter/gdm-user-manager.c (original)
+++ trunk/gui/simple-greeter/gdm-user-manager.c Wed Mar 12 16:17:59 2008
@@ -216,6 +216,7 @@
gboolean ret;
ret = FALSE;
+ reply = NULL;
dbus_error_init (&local_error);
message = dbus_message_new_method_call ("org.freedesktop.ConsoleKit",
@@ -248,6 +249,13 @@
ret = TRUE;
out:
+ if (message != NULL) {
+ dbus_message_unref (message);
+ }
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
+
return ret;
}
Modified: trunk/utils/gdmflexiserver.c
==============================================================================
--- trunk/utils/gdmflexiserver.c (original)
+++ trunk/utils/gdmflexiserver.c Wed Mar 12 16:17:59 2008
@@ -147,6 +147,7 @@
const char *value;
ret = FALSE;
+ reply = NULL;
dbus_error_init (&local_error);
message = dbus_message_new_method_call (GDM_DBUS_NAME,
@@ -174,10 +175,15 @@
dbus_message_iter_get_basic (&iter, &value);
g_debug ("Started %s", value);
- dbus_message_unref (reply);
-
ret = TRUE;
out:
+ if (message != NULL) {
+ dbus_message_unref (message);
+ }
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
+
return ret;
}
@@ -193,6 +199,7 @@
const char *value;
ret = FALSE;
+ reply = NULL;
dbus_error_init (&local_error);
message = dbus_message_new_method_call (CK_NAME,
@@ -221,10 +228,16 @@
if (session_id != NULL) {
*session_id = g_strdup (value);
}
- dbus_message_unref (reply);
ret = TRUE;
out:
+ if (message != NULL) {
+ dbus_message_unref (message);
+ }
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
+
return ret;
}
@@ -241,6 +254,7 @@
const char *value;
ret = FALSE;
+ reply = NULL;
dbus_error_init (&local_error);
message = dbus_message_new_method_call (CK_NAME,
@@ -269,10 +283,16 @@
if (seat_id != NULL) {
*seat_id = g_strdup (value);
}
- dbus_message_unref (reply);
ret = TRUE;
out:
+ if (message != NULL) {
+ dbus_message_unref (message);
+ }
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
+
return ret;
}
@@ -306,6 +326,7 @@
gboolean ret;
ret = FALSE;
+ reply = NULL;
g_debug ("Switching to session %s", session_id);
@@ -340,6 +361,13 @@
ret = TRUE;
out:
+ if (message != NULL) {
+ dbus_message_unref (message);
+ }
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
+
return ret;
}
@@ -355,6 +383,7 @@
const char *value;
ret = FALSE;
+ reply = NULL;
dbus_error_init (&local_error);
message = dbus_message_new_method_call (CK_NAME,
@@ -385,10 +414,15 @@
goto out;
}
- dbus_message_unref (reply);
-
ret = TRUE;
out:
+ if (message != NULL) {
+ dbus_message_unref (message);
+ }
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
+
return ret;
}
@@ -403,6 +437,7 @@
gboolean can_activate;
can_activate = FALSE;
+ reply = NULL;
dbus_error_init (&local_error);
message = dbus_message_new_method_call (CK_NAME,
@@ -428,9 +463,15 @@
dbus_message_iter_init (reply, &iter);
dbus_message_iter_get_basic (&iter, &can_activate);
- dbus_message_unref (reply);
out:
+ if (message != NULL) {
+ dbus_message_unref (message);
+ }
+ if (reply != NULL) {
+ dbus_message_unref (reply);
+ }
+
return can_activate;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]