diff options
| -rw-r--r-- | ChangeLog | 44 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | src/apt-transaction.c | 1 | ||||
| -rw-r--r-- | src/apt-watcher.c | 3 | ||||
| -rw-r--r-- | src/settings-helper.c | 27 |
7 files changed, 75 insertions, 13 deletions
@@ -1,5 +1,49 @@ # Generated by Makefile. Do not edit. +2011-10-13 Ted Gould <ted@gould.cx> + + 0.3.7 + +2011-10-12 Ted Gould <ted@gould.cx> + + Fix variant handling + +2011-10-09 Ted Gould <ted@gould.cx> + + Attach bug + +2011-10-09 Ted Gould <ted@gould.cx> + + Don't unref the parameters as we don't make a ref to it + +2011-10-09 Ted Gould <ted@gould.cx> + + Make sure to reference the variant, and unref the value we get + +2011-10-12 Ted Gould <ted@gould.cx> + + Check to ensure we have settings, else default values. + +2011-10-12 Ted Gould <ted@gould.cx> + + Okay, get all of them I guess + +2011-10-10 Ted Gould <ted@gould.cx> + + Use a temporary variable to defeat G_DISABLE_CHECKS + +2011-10-08 Ted Gould <ted@gould.cx> + + Error gracefully if we can't get our settings. + +2011-10-12 Ted Gould <ted@gould.cx> + + Okay, fixing again. Now right. + +2011-10-03 Ken VanDine <ken.vandine@canonical.com> + + Fixed improperly mapped gconf to gsettings keys, fixes crasher (LP: #858798) + 2011-09-27 Ted Gould <ted@gould.cx> 0.3.6 @@ -2745,7 +2745,7 @@ fi # Define the identity of the package. PACKAGE=indicator-session - VERSION=0.3.6 + VERSION=0.3.7 cat >>confdefs.h <<_ACEOF diff --git a/configure.ac b/configure.ac index 0f141b5..b29db0b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) 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 diff --git a/debian/changelog b/debian/changelog index 49bfb00..2d5c66e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +indicator-session (0.3.7-0ubuntu1~ppa1) UNRELEASED; 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 <ted@ubuntu.com> Thu, 13 Oct 2011 13:14:33 -0500 + indicator-session (0.3.6-0ubuntu2) oneiric; urgency=low * data/indicator-session.convert diff --git a/src/apt-transaction.c b/src/apt-transaction.c index 317d74a..2b3f5a4 100644 --- a/src/apt-transaction.c +++ b/src/apt-transaction.c @@ -232,7 +232,6 @@ apt_transaction_receive_signal (GDBusProxy * proxy, 0, current_state); } - g_variant_unref (parameters); } static void diff --git a/src/apt-watcher.c b/src/apt-watcher.c index d8bb7e2..481029a 100644 --- a/src/apt-watcher.c +++ b/src/apt-watcher.c @@ -425,7 +425,7 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy, 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 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy, } } + g_variant_unref (value); g_variant_unref (parameters); } diff --git a/src/settings-helper.c b/src/settings-helper.c index d70df95..007f83f 100644 --- a/src/settings-helper.c +++ b/src/settings-helper.c @@ -38,41 +38,49 @@ static guint logout_notify = 0; 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 @@ update_shutdown_callback (GSettings * settings, const gchar * key, gpointer data 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); |