diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-04-11 11:05:58 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-04-11 11:05:58 -0500 |
| commit | 06d8dda36decf33bc41e638ac8d59abed9abafbb (patch) | |
| tree | ec482f0b523b77ad175ebc57640977f63b1cb87e /src | |
| parent | 1d55884edc3c5f053937678858495b576db4e2a6 (diff) | |
| parent | b4f82a39f26fae8c72f02d717141df87bc866058 (diff) | |
| download | ayatana-indicator-messages-06d8dda36decf33bc41e638ac8d59abed9abafbb.tar.gz ayatana-indicator-messages-06d8dda36decf33bc41e638ac8d59abed9abafbb.tar.bz2 ayatana-indicator-messages-06d8dda36decf33bc41e638ac8d59abed9abafbb.zip | |
Import upstream version 0.6.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/messages-service.c | 5 | ||||
| -rw-r--r-- | src/status-provider-mc5.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/messages-service.c b/src/messages-service.c index 8e85da2..078cee3 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -29,7 +29,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libindicator/indicator-service.h> #include <gio/gio.h> #include <glib/gi18n.h> -#include <gtk/gtk.h> #include <libdbusmenu-glib/client.h> #include <libdbusmenu-glib/server.h> @@ -665,9 +664,7 @@ server_shortcut_added (AppMenuItem * appitem, DbusmenuMenuitem * mi, gpointer da g_debug("Application Shortcut added: %s", mi != NULL ? dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL) : "none"); DbusmenuMenuitem * shell = DBUSMENU_MENUITEM(data); if (mi != NULL) { -#if GTK_CHECK_VERSION(3, 0, 0) - dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, ""); -#endif + dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK); dbusmenu_menuitem_child_append(shell, mi); } resort_menu(shell); diff --git a/src/status-provider-mc5.c b/src/status-provider-mc5.c index e70496c..3f23565 100644 --- a/src/status-provider-mc5.c +++ b/src/status-provider-mc5.c @@ -137,7 +137,7 @@ status_provider_mc5_init (StatusProviderMC5 *self) { StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self); - priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED; + priv->status = STATUS_PROVIDER_STATUS_OFFLINE; priv->manager = NULL; DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); @@ -219,7 +219,7 @@ dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar * prev, con priv->manager = NULL; } - priv->status = STATUS_PROVIDER_STATUS_DISCONNECTED; + priv->status = STATUS_PROVIDER_STATUS_OFFLINE; g_signal_emit(G_OBJECT(self), STATUS_PROVIDER_SIGNAL_STATUS_CHANGED_ID, 0, priv->status, TRUE); } @@ -282,7 +282,7 @@ get_status (StatusProvider * sp) StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp); if (priv->manager == NULL) { - return STATUS_PROVIDER_STATUS_DISCONNECTED; + return STATUS_PROVIDER_STATUS_OFFLINE; } return priv->status; |