Merge lp:~indicator-applet-developers/indicator-session/ubuntu into lp:~ubuntu-desktop/indicator-session/ubuntu

[Ted Gould]

Some fixes.

=== modified file 'ChangeLog'
--- ChangeLog	2011-09-27 21:56:12 +0000
+++ ChangeLog	2011-10-13 18:23:36 +0000
@@ -1,5 +1,49 @@
 # Generated by Makefile. Do not edit.
 
[phone]  Ted Gould  <[e-mail]>
+
+	0.3.7
+
[phone]  Ted Gould  <[e-mail]>
+
+	Fix variant handling
+
[phone]  Ted Gould  <[e-mail]>
+
+	Attach bug
+
[phone]  Ted Gould  <[e-mail]>
+
+	Don't unref the parameters as we don't make a ref to it
+
[phone]  Ted Gould  <[e-mail]>
+
+	Make sure to reference the variant, and unref the value we get
+
[phone]  Ted Gould  <[e-mail]>
+
+	Check to ensure we have settings, else default values.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Okay, get all of them I guess
+
[phone]  Ted Gould  <[e-mail]>
+
+	Use a temporary variable to defeat G_DISABLE_CHECKS
+
[phone]  Ted Gould  <[e-mail]>
+
+	Error gracefully if we can't get our settings.
+
[phone]  Ted Gould  <[e-mail]>
+
+	Okay, fixing again.  Now right.
+
[phone]  Ken VanDine  <[e-mail]>
+
+	Fixed improperly mapped gconf to gsettings keys, fixes crasher (LP: #858798)
+
 2011-09-27  Ted Gould  <[e-mail]>
 
 	0.3.6

=== modified file 'configure'
--- configure	2011-09-27 21:56:12 +0000
+++ configure	2011-10-13 18:23:36 +0000
@@ -2745,7 +2745,7 @@
 
 # Define the identity of the package.
  PACKAGE=indicator-session
- VERSION=0.3.6
+ VERSION=0.3.7
 
 
 cat >>confdefs.h <<_ACEOF

=== modified file 'configure.ac'
--- configure.ac	2011-09-27 22:05:28 +0000
+++ configure.ac	2011-10-13 18:23:36 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.3.6)
+AM_INIT_AUTOMAKE(indicator-session, 0.3.7)
 
 AM_MAINTAINER_MODE
 

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-03 14:29:47 +0000
+++ debian/changelog	2011-10-13 18:23:36 +0000
@@ -1,3 +1,12 @@
+indicator-session (0.3.7-0ubuntu1~ppa1) oneiric; urgency=low
+
+  * New upstream release.
+    * Fix some variant ref issues causing crashes (LP: #863930)
+    * Handle cases of returned dbus messages from ConsoleKit (LP: #864085)
+    * Fixed improperly mapped gconf to gsettings keys (LP: #858798)
+
+ -- Ted Gould <[e-mail]>  Thu, 13 Oct 2011 13:19:13 -0500
+
 indicator-session (0.3.6-0ubuntu2) oneiric; urgency=low
 
   * data/indicator-session.convert

=== modified file 'src/apt-transaction.c'
--- src/apt-transaction.c	2011-09-07 11:04:16 +0000
+++ src/apt-transaction.c	2011-10-13 18:23:36 +0000
@@ -232,7 +232,6 @@
                    0,
                    current_state);
   }
-  g_variant_unref (parameters);
 }
 
 static void

=== modified file 'src/apt-watcher.c'
--- src/apt-watcher.c	2011-09-19 20:47:59 +0000
+++ src/apt-watcher.c	2011-10-13 18:23:36 +0000
@@ -425,7 +425,7 @@
   g_return_if_fail (APT_IS_WATCHER (user_data));
   AptWatcher* self = APT_WATCHER (user_data);
 
-  g_variant_ref (parameters);
+  g_variant_ref_sink (parameters);
   GVariant *value = g_variant_get_child_value (parameters, 0);
 
   if (g_strcmp0(signal_name, "ActiveTransactionsChanged") == 0){
@@ -477,6 +477,7 @@
     }    
   } 
 
+  g_variant_unref (value);
   g_variant_unref (parameters);
 }
 

=== modified file 'src/settings-helper.c'
--- src/settings-helper.c	2011-09-06 15:52:08 +0000
+++ src/settings-helper.c	2011-10-13 18:23:36 +0000
@@ -38,41 +38,49 @@
 static guint restart_notify = 0;
 static guint shutdown_notify = 0;
 
-static void
+static gboolean
 build_settings (void) {
-	if(!settings) {
+	if (settings == NULL) {
 		settings = g_settings_new (SESSION_SCHEMA);
 	}
-	return;
+	if (settings == NULL) {
+		return FALSE;
+	}
+	return TRUE;
 }
 
 gboolean
 supress_confirmations (void) {
-	build_settings();
+	gboolean settings_built = build_settings();
+	g_return_val_if_fail(settings_built, FALSE);
 	return g_settings_get_boolean (settings, SUPPRESS_KEY) ;
 }
 
 gboolean
 should_show_user_menu (void) {
-	build_settings();
+	gboolean settings_built = build_settings();
+	g_return_val_if_fail(settings_built, TRUE);
 	return g_settings_get_boolean (settings, SHOW_USER_MENU) ;
 }
 
 gboolean
 show_logout (void) {
-	build_settings();
+	gboolean settings_built = build_settings();
+	g_return_val_if_fail(settings_built, TRUE);
 	return !g_settings_get_boolean (settings, LOGOUT_KEY) ;
 }
 
 gboolean
 show_restart (void) {
-	build_settings();
+	gboolean settings_built = build_settings();
+	g_return_val_if_fail(settings_built, TRUE);
 	return !g_settings_get_boolean (settings, RESTART_KEY) ;
 }
 
 gboolean
 show_shutdown (void) {
-	build_settings();
+	gboolean settings_built = build_settings();
+	g_return_val_if_fail(settings_built, TRUE);
 	return !g_settings_get_boolean (settings, SHUTDOWN_KEY) ;
 }
 
@@ -122,7 +130,8 @@
 void
 update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi) {
 	/* If we don't have a client, build one. */
-	build_settings();
+	gboolean settings_built = build_settings();
+	g_return_if_fail(settings_built);
 
 	if (confirmation_notify != 0) {
 		g_signal_handler_disconnect (settings, confirmation_notify);