aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac2
-rw-r--r--debian/changelog15
-rw-r--r--debian/control4
-rw-r--r--src/im-menu-item.c14
-rw-r--r--src/messages-service.c4
5 files changed, 28 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac
index ef2239b..a3d937b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ GIO_UNIX_REQUIRED_VERSION=2.18
PANEL_REQUIRED_VERSION=2.0.0
INDICATE_REQUIRED_VERSION=0.2.0
INDICATOR_REQUIRED_VERSION=0.2.0
-DBUSMENUGTK_REQUIRED_VERSION=0.0.2
+DBUSMENUGTK_REQUIRED_VERSION=0.1.1
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 f00c871..df6ee00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+indicator-messages (0.2.0-0ubuntu1~ppa3) karmic; urgency=low
+
+ * Upstream usage of new Dbusmenu 0.1.1 defines.
+ * debian/control: Increasing Dbusmenu dependencies.
+
+ -- Ted Gould <ted@ubuntu.com> Fri, 04 Sep 2009 13:50:50 -0500
+
+indicator-messages (0.2.0-0ubuntu1~ppa2) karmic; urgency=low
+
+ * Upstream update to dbusmenu dependency.
+ * debian/control: Adding dependency information for libdbusmenu
+ to say >= 0.1.0 to match upstream build system.
+
+ -- Ted Gould <ted@ubuntu.com> Thu, 27 Aug 2009 14:01:03 -0500
+
indicator-messages (0.2.0-0ubuntu2) karmic; urgency=low
* debian/control
diff --git a/debian/control b/debian/control
index f152a2e..99fbbcf 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: debhelper (>= 5.0),
libindicate-dev (>= 0.2.0~bzr298),
libindicate-gtk-dev (>= 0.2.0~bzr298),
libindicator-dev (>= 0.2.0~bzr301),
- libdbusmenu-gtk-dev (>= 0.1.0),
- libdbusmenu-glib-dev (>= 0.1.0)
+ libdbusmenu-gtk-dev (>= 0.1.1),
+ libdbusmenu-glib-dev (>= 0.1.1)
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 008e33f..6f58ebd 100644
--- a/src/im-menu-item.c
+++ b/src/im-menu-item.c
@@ -24,6 +24,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#include <glib/gi18n.h>
+#include <libdbusmenu-glib/client.h>
#include <libindicate-gtk/indicator.h>
#include <libindicate-gtk/listener.h>
#include "im-menu-item.h"
@@ -73,7 +74,7 @@ static void icon_cb (IndicateListener * listener,
IndicateListenerServer * server,
IndicateListenerIndicator * indicator,
gchar * property,
- GdkPixbuf * propertydata,
+ gchar * propertydata,
gpointer data);
static void activate_cb (ImMenuItem * self,
gpointer data);
@@ -147,10 +148,9 @@ im_menu_item_finalize (GObject *object)
}
static void
-icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GdkPixbuf * propertydata, gpointer data)
+icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data)
{
- /* dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "icon", propertydata); */
-
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(data), DBUSMENU_MENUITEM_PROP_ICON_DATA, propertydata);
return;
}
@@ -280,7 +280,7 @@ indicator_modified_cb (IndicateListener * listener, IndicateListenerServer * ser
} else if (!g_strcmp0(property, "time")) {
indicate_listener_get_property_time(listener, server, indicator, "time", time_cb, self);
} else if (!g_strcmp0(property, "icon")) {
- indicate_listener_get_property_icon(listener, server, indicator, "icon", icon_cb, self);
+ indicate_listener_get_property(listener, server, indicator, "icon", icon_cb, self);
}
return;
@@ -299,9 +299,11 @@ im_menu_item_new (IndicateListener * listener, IndicateListenerServer * server,
priv->show_time = show_time;
priv->time_update_min = 0;
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "type", DBUSMENU_CLIENT_TYPES_IMAGE);
+
indicate_listener_get_property(listener, server, indicator, "sender", sender_cb, self);
indicate_listener_get_property_time(listener, server, indicator, "time", time_cb, self);
- indicate_listener_get_property_icon(listener, server, indicator, "icon", icon_cb, self);
+ indicate_listener_get_property(listener, server, indicator, "icon", icon_cb, self);
g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL);
priv->indicator_changed = g_signal_connect(G_OBJECT(listener), INDICATE_LISTENER_SIGNAL_INDICATOR_MODIFIED, G_CALLBACK(indicator_modified_cb), self);
diff --git a/src/messages-service.c b/src/messages-service.c
index 093ebfd..754021b 100644
--- a/src/messages-service.c
+++ b/src/messages-service.c
@@ -531,7 +531,7 @@ server_removed (IndicateListener * listener, IndicateListenerServer * server, gc
serverList = g_list_remove(serverList, sltp);
if (sltp->menuitem != NULL) {
- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(sltp->menuitem), "visibile", "false");
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(sltp->menuitem), DBUSMENU_MENUITEM_PROP_VISIBLE, "false");
dbusmenu_menuitem_child_delete(DBUSMENU_MENUITEM(data), DBUSMENU_MENUITEM(sltp->menuitem));
g_object_unref(G_OBJECT(sltp->menuitem));
}
@@ -776,7 +776,7 @@ indicator_removed (IndicateListener * listener, IndicateListenerServer * server,
g_signal_handler_disconnect(menuitem, ilt->timechange_cb);
g_free(ilt);
- dbusmenu_menuitem_property_set(menuitem, "visibile", "false");
+ dbusmenu_menuitem_property_set(menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, "false");
dbusmenu_menuitem_child_delete(DBUSMENU_MENUITEM(data), menuitem);
removed = TRUE;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-31 06:48:56 +0000