diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-03-29 13:50:56 -0700 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-03-29 13:50:56 -0700 |
| commit | 4ecaca4861ec00e19936e9655de38c118bdc9a62 (patch) | |
| tree | 1ac030eddd79f83c8f1618a84bc85dd316d6f697 /libindicator | |
| parent | 67872e2808a7c4f4d414822198e4a3f951bdf411 (diff) | |
| parent | 5a839c4176325651423480b7f9770f959bf37f32 (diff) | |
| download | libayatana-indicator-4ecaca4861ec00e19936e9655de38c118bdc9a62.tar.gz libayatana-indicator-4ecaca4861ec00e19936e9655de38c118bdc9a62.tar.bz2 libayatana-indicator-4ecaca4861ec00e19936e9655de38c118bdc9a62.zip | |
Import upstream version 0.4.94
Diffstat (limited to 'libindicator')
| -rw-r--r-- | libindicator/Makefile.in | 1 | ||||
| -rw-r--r-- | libindicator/indicator-image-helper.c | 1 | ||||
| -rw-r--r-- | libindicator/indicator-service-manager.c | 7 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libindicator/Makefile.in b/libindicator/Makefile.in index a32cc29..6891b1b 100644 --- a/libindicator/Makefile.in +++ b/libindicator/Makefile.in @@ -259,6 +259,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_aux_dir = @ac_aux_dir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ diff --git a/libindicator/indicator-image-helper.c b/libindicator/indicator-image-helper.c index 23b08d0..6ad2a44 100644 --- a/libindicator/indicator-image-helper.c +++ b/libindicator/indicator-image-helper.c @@ -74,6 +74,7 @@ refresh_image (GtkImage * image) if (pixbuf == NULL) { g_warning("Unable to load icon from file '%s' because: %s", icon_filename, error == NULL ? "I don't know" : error->message); + g_clear_error (&error); gtk_image_clear(image); return; } diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c index f58c148..33b0557 100644 --- a/libindicator/indicator-service-manager.c +++ b/libindicator/indicator-service-manager.c @@ -536,8 +536,8 @@ service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_n { IndicatorServiceManagerPrivate * priv = INDICATOR_SERVICE_MANAGER_GET_PRIVATE(user_data); - const gchar * new_name = NULL; - const gchar * prev_name = NULL; + gchar * new_name = NULL; + gchar * prev_name = NULL; g_variant_get(parameters, "(&s&s&s)", NULL, &prev_name, &new_name); if (new_name == NULL || new_name[0] == 0) { @@ -571,6 +571,9 @@ service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_n } } + g_free (new_name); + g_free (prev_name); + return; } |