Messaging Menu

Merge lp:~ted/indicator-messages/dbusmenu011 into lp:indicator-messages/0.5

  1. dbusmenu011
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/indicator-messages/dbusmenu011
Merge into: lp:indicator-messages/0.5
Diff against target: None lines
To merge this branch: bzr merge lp:~ted/indicator-messages/dbusmenu011
Reviewer Review Type Date Requested Status
David Barth Approve
Review via email: mp+11200@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

DBus Menu 0.1.1 (0.1.2) update. Small stuff really.

Revision history for this message
David Barth (dbarth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2009-08-27 18:58:13 +0000
3+++ configure.ac 2009-09-03 19:06:22 +0000
4@@ -28,7 +28,7 @@
5 PANEL_REQUIRED_VERSION=2.0.0
6 INDICATE_REQUIRED_VERSION=0.2.0
7 INDICATOR_REQUIRED_VERSION=0.2.0
8-DBUSMENUGTK_REQUIRED_VERSION=0.1.0
9+DBUSMENUGTK_REQUIRED_VERSION=0.1.1
10
11 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
12 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
13
14=== modified file 'src/im-menu-item.c'
15--- src/im-menu-item.c 2009-08-26 21:47:55 +0000
16+++ src/im-menu-item.c 2009-09-04 14:02:34 +0000
17@@ -24,6 +24,7 @@
18 #endif
19
20 #include <glib/gi18n.h>
21+#include <libdbusmenu-glib/client.h>
22 #include <libindicate-gtk/indicator.h>
23 #include <libindicate-gtk/listener.h>
24 #include "im-menu-item.h"
25@@ -73,7 +74,7 @@
26 IndicateListenerServer * server,
27 IndicateListenerIndicator * indicator,
28 gchar * property,
29- GdkPixbuf * propertydata,
30+ gchar * propertydata,
31 gpointer data);
32 static void activate_cb (ImMenuItem * self,
33 gpointer data);
34@@ -147,10 +148,9 @@
35 }
36
37 static void
38-icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, GdkPixbuf * propertydata, gpointer data)
39+icon_cb (IndicateListener * listener, IndicateListenerServer * server, IndicateListenerIndicator * indicator, gchar * property, gchar * propertydata, gpointer data)
40 {
41- /* dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "icon", propertydata); */
42-
43+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(data), DBUSMENU_MENUITEM_PROP_ICON_DATA, propertydata);
44 return;
45 }
46
47@@ -280,7 +280,7 @@
48 } else if (!g_strcmp0(property, "time")) {
49 indicate_listener_get_property_time(listener, server, indicator, "time", time_cb, self);
50 } else if (!g_strcmp0(property, "icon")) {
51- indicate_listener_get_property_icon(listener, server, indicator, "icon", icon_cb, self);
52+ indicate_listener_get_property(listener, server, indicator, "icon", icon_cb, self);
53 }
54
55 return;
56@@ -299,9 +299,11 @@
57 priv->show_time = show_time;
58 priv->time_update_min = 0;
59
60+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(self), "type", DBUSMENU_CLIENT_TYPES_IMAGE);
61+
62 indicate_listener_get_property(listener, server, indicator, "sender", sender_cb, self);
63 indicate_listener_get_property_time(listener, server, indicator, "time", time_cb, self);
64- indicate_listener_get_property_icon(listener, server, indicator, "icon", icon_cb, self);
65+ indicate_listener_get_property(listener, server, indicator, "icon", icon_cb, self);
66
67 g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL);
68 priv->indicator_changed = g_signal_connect(G_OBJECT(listener), INDICATE_LISTENER_SIGNAL_INDICATOR_MODIFIED, G_CALLBACK(indicator_modified_cb), self);
69
70=== modified file 'src/messages-service.c'
71--- src/messages-service.c 2009-08-26 21:47:55 +0000
72+++ src/messages-service.c 2009-09-03 19:13:45 +0000
73@@ -531,7 +531,7 @@
74 serverList = g_list_remove(serverList, sltp);
75
76 if (sltp->menuitem != NULL) {
77- dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(sltp->menuitem), "visibile", "false");
78+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(sltp->menuitem), DBUSMENU_MENUITEM_PROP_VISIBLE, "false");
79 dbusmenu_menuitem_child_delete(DBUSMENU_MENUITEM(data), DBUSMENU_MENUITEM(sltp->menuitem));
80 g_object_unref(G_OBJECT(sltp->menuitem));
81 }
82@@ -776,7 +776,7 @@
83 g_signal_handler_disconnect(menuitem, ilt->timechange_cb);
84 g_free(ilt);
85
86- dbusmenu_menuitem_property_set(menuitem, "visibile", "false");
87+ dbusmenu_menuitem_property_set(menuitem, DBUSMENU_MENUITEM_PROP_VISIBLE, "false");
88 dbusmenu_menuitem_child_delete(DBUSMENU_MENUITEM(data), menuitem);
89 removed = TRUE;
90 }

Subscribers

People subscribed via source and target branches

to all changes: