diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | src/im-menu-item.c | 2 | ||||
| -rw-r--r-- | src/indicator-messages.c | 8 | ||||
| -rw-r--r-- | src/launcher-menu-item.c | 2 | ||||
| -rw-r--r-- | src/messages-service.c | 4 |
7 files changed, 18 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 29231a8..db3e80d 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ GIO_UNIX_REQUIRED_VERSION=2.18 PANEL_REQUIRED_VERSION=2.0.0 INDICATE_REQUIRED_VERSION=0.2.0 INDICATOR_REQUIRED_VERSION=0.3.0 -DBUSMENUGTK_REQUIRED_VERSION=0.1.1 +DBUSMENUGTK_REQUIRED_VERSION=0.2.0 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION diff --git a/debian/changelog b/debian/changelog index 7592cfc..b2a72da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-messages (0.3.0~dev-0ubuntu1~ppa3) UNRELEASED; urgency=low + + * Upgrading to dbusmenu 0.2.0 + * debian/control: Updating dbusmenu dependency to 0.2.0~dev + + -- Ted Gould <ted@ubuntu.com> Tue, 22 Dec 2009 14:48:35 -0600 + indicator-messages (0.3.0~dev-0ubuntu1~ppa2) karmic; urgency=low * Disabling static builds. diff --git a/debian/control b/debian/control index ab92d8b..0023281 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: debhelper (>= 5.0), libindicate-dev (>= 0.2.0), libindicate-gtk-dev (>= 0.2.0), libindicator-dev (>= 0.3.0~dev), - libdbusmenu-gtk-dev (>= 0.1.1), - libdbusmenu-glib-dev (>= 0.1.1) + libdbusmenu-gtk-dev (>= 0.2.0~dev), + libdbusmenu-glib-dev (>= 0.2.0~dev) Standards-Version: 3.8.0 Homepage: https://launchpad.net/indicator-applet Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-messages/ubuntu diff --git a/src/im-menu-item.c b/src/im-menu-item.c index 9ea7ec7..035b2da 100644 --- a/src/im-menu-item.c +++ b/src/im-menu-item.c @@ -442,7 +442,7 @@ im_menu_item_new (IndicateListener * listener, IndicateListenerServer * server, priv->attention = FALSE; priv->show = TRUE; - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "type", INDICATOR_MENUITEM_TYPE); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, INDICATOR_MENUITEM_TYPE); indicate_listener_displayed(listener, server, indicator, TRUE); diff --git a/src/indicator-messages.c b/src/indicator-messages.c index 54e67c9..acb2e68 100644 --- a/src/indicator-messages.c +++ b/src/indicator-messages.c @@ -218,14 +218,14 @@ struct _indicator_item_t { /* Whenever we have a property change on a DbusmenuMenuitem we need to be responsive to that. */ static void -indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, gchar * value, indicator_item_t * mi_data) +indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data) { if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) { /* Set the main label */ - gtk_label_set_text(GTK_LABEL(mi_data->label), value); + gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value)); } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT)) { /* Set the right label */ - gtk_label_set_text(GTK_LABEL(mi_data->right), value); + gtk_label_set_text(GTK_LABEL(mi_data->right), g_value_get_string(value)); } else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_ICON)) { /* We don't use the value here, which is probably less efficient, but it's easier to use the easy function. And since th value @@ -351,7 +351,7 @@ new_launcher_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusme GtkWidget * app_label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_NAME)); gtk_misc_set_alignment(GTK_MISC(app_label), 0.0, 0.5); GtkWidget * dsc_label = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(dsc_label), 0.05, 0.5); + gtk_misc_set_alignment(GTK_MISC(dsc_label), 0.0, 0.5); gtk_label_set_ellipsize(GTK_LABEL(dsc_label), PANGO_ELLIPSIZE_END); gtk_widget_set_size_request(dsc_label, 200, -1); gchar * markup = g_markup_printf_escaped("<span font-size=\"smaller\">%s</span>", dbusmenu_menuitem_property_get(newitem, LAUNCHER_MENUITEM_PROP_APP_DESC)); diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c index 5afe7a9..d203bba 100644 --- a/src/launcher-menu-item.c +++ b/src/launcher-menu-item.c @@ -131,7 +131,7 @@ launcher_menu_item_new (const gchar * desktop_file) priv->desktop = g_strdup(desktop_file); g_debug("\tName: %s", launcher_menu_item_get_name(self)); - dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "type", LAUNCHER_MENUITEM_TYPE); + dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), DBUSMENU_MENUITEM_PROP_TYPE, LAUNCHER_MENUITEM_TYPE); dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_NAME, launcher_menu_item_get_name(self)); dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), LAUNCHER_MENUITEM_PROP_APP_DESC, launcher_menu_item_get_description(self)); diff --git a/src/messages-service.c b/src/messages-service.c index f5681b7..f1e1b0d 100644 --- a/src/messages-service.c +++ b/src/messages-service.c @@ -488,7 +488,7 @@ server_added (IndicateListener * listener, IndicateListenerServer * server, gcha /* Build a separator */ sl_item->separator = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set(sl_item->separator, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR); + dbusmenu_menuitem_property_set(sl_item->separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); /* Incase we got an indicator first */ GList * alreadythere = g_list_find_custom(serverList, sl_item, serverList_equal); @@ -1139,7 +1139,7 @@ build_launcher (gpointer data) /* Build a separator */ ll->separator = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set(ll->separator, "type", DBUSMENU_CLIENT_TYPES_SEPARATOR); + dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); /* Add it to the list */ launcherList = g_list_insert_sorted(launcherList, ll, launcherList_sort); |