diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-01-30 11:06:26 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-01-30 11:06:26 +0000 |
| commit | bd333ad26f451f27f0d412f8a42f42459377bd7c (patch) | |
| tree | 88817c7c7f21fc3c63395767e9c42acd588eefef /src | |
| parent | ee33a9adfc9c657c3be11a8bcaf25e687fdde026 (diff) | |
| parent | 3e9b3f1cd28e9c9e1263796297f5d648a163be9e (diff) | |
| download | libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.tar.gz libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.tar.bz2 libayatana-appindicator-bd333ad26f451f27f0d412f8a42f42459377bd7c.zip | |
This is a continuation of ~mathieu-tl/libappindicator/fix-test-merge/ which adds fixes for bug #1102589, bug #1102595, bug #1109128, and bug #1103087, which should get it finally passing CI. Fixes: https://bugs.launchpad.net/bugs/1102589, https://bugs.launchpad.net/bugs/1102595, https://bugs.launchpad.net/bugs/1103087, https://bugs.launchpad.net/bugs/1109128.
Approved by Ted Gould, PS Jenkins bot.
Diffstat (limited to 'src')
| -rw-r--r-- | src/app-indicator.c | 26 | ||||
| -rw-r--r-- | src/generate-id.c | 2 |
2 files changed, 11 insertions, 17 deletions
diff --git a/src/app-indicator.c b/src/app-indicator.c index 2e98b48..0bc33af 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1886,20 +1886,14 @@ app_indicator_set_attention_icon_full (AppIndicator *self, const gchar *icon_nam gboolean changed = FALSE; if (g_strcmp0 (self->priv->attention_icon_name, icon_name) != 0) { - if (self->priv->attention_icon_name) { - g_free (self->priv->attention_icon_name); - } - - self->priv->attention_icon_name = g_strdup(icon_name); + g_free (self->priv->attention_icon_name); + self->priv->attention_icon_name = g_strdup (icon_name); changed = TRUE; } if (g_strcmp0(self->priv->att_accessible_desc, icon_desc) != 0) { - if (self->priv->att_accessible_desc) { - g_free (self->priv->att_accessible_desc); - } - - self->priv->att_accessible_desc = g_strdup(icon_name); + g_free (self->priv->att_accessible_desc); + self->priv->att_accessible_desc = g_strdup (icon_desc); changed = TRUE; } @@ -1910,12 +1904,12 @@ app_indicator_set_attention_icon_full (AppIndicator *self, const gchar *icon_nam GError * error = NULL; g_dbus_connection_emit_signal(self->priv->connection, - NULL, - self->priv->path, - NOTIFICATION_ITEM_DBUS_IFACE, - "NewAttentionIcon", - NULL, - &error); + NULL, + self->priv->path, + NOTIFICATION_ITEM_DBUS_IFACE, + "NewAttentionIcon", + NULL, + &error); if (error != NULL) { g_warning("Unable to send signal for NewAttentionIcon: %s", error->message); diff --git a/src/generate-id.c b/src/generate-id.c index 6389678..6208997 100644 --- a/src/generate-id.c +++ b/src/generate-id.c @@ -65,5 +65,5 @@ _generate_id (const AppIndicatorCategory catenum, const gchar * id) } } - return (((((category * 256) + first) * 256) + second) * 256) + third; + return (((((category << 8) + first) << 8) + second) << 8) + third; } |