Application Menu Indicator

Merge lp:~ted/indicator-appmenu/fix-dbusmenu-api into lp:indicator-appmenu/0.3

  1. fix-dbusmenu-api
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: 107
Proposed branch: lp:~ted/indicator-appmenu/fix-dbusmenu-api
Merge into: lp:indicator-appmenu/0.3
Diff against target: 66 lines (+4/-22)
1 file modified
src/window-menus.c (+4/-22)
To merge this branch: bzr merge lp:~ted/indicator-appmenu/fix-dbusmenu-api
Reviewer Review Type Date Requested Status
Conor Curran (community) Approve
Review via email: mp+51649@code.launchpad.net

Description of the change

Works with the new dbusmenu API. Hope no one from distro figures out this is FTBFS ;)

To post a comment you must log in.
Revision history for this message
Conor Curran (cjcurran) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/window-menus.c'
2--- src/window-menus.c 2011-02-17 20:01:38 +0000
3+++ src/window-menus.c 2011-02-28 22:56:11 +0000
4@@ -42,10 +42,6 @@
5 GArray * entries;
6 gboolean error_state;
7 guint retry_timer;
8- gint retry_id;
9- gchar * retry_name;
10- GVariant * retry_data;
11- guint retry_timestamp;
12 };
13
14 typedef struct _WMEntry WMEntry;
15@@ -245,10 +241,6 @@
16 if (priv->retry_timer != 0) {
17 g_source_remove(priv->retry_timer);
18 priv->retry_timer = 0;
19- g_variant_unref(priv->retry_data);
20- priv->retry_data = NULL;
21- g_free(priv->retry_name);
22- priv->retry_name = NULL;
23 }
24
25 G_OBJECT_CLASS (window_menus_parent_class)->dispose (object);
26@@ -264,13 +256,12 @@
27 g_return_val_if_fail(IS_WINDOW_MENUS(user_data), FALSE);
28 WindowMenusPrivate * priv = WINDOW_MENUS_GET_PRIVATE(user_data);
29
30- dbusmenu_client_send_event(DBUSMENU_CLIENT(priv->client), priv->retry_id, priv->retry_name, priv->retry_data, priv->retry_timestamp);
31+ dbusmenu_menuitem_handle_event(dbusmenu_client_get_root(DBUSMENU_CLIENT(priv->client)),
32+ "x-appmenu-retry-ping",
33+ NULL,
34+ 0);
35
36 priv->retry_timer = 0;
37- g_variant_unref(priv->retry_data);
38- priv->retry_data = NULL;
39- g_free(priv->retry_name);
40- priv->retry_name = NULL;
41
42 return FALSE;
43 }
44@@ -303,10 +294,6 @@
45 if (priv->retry_timer != 0) {
46 g_source_remove(priv->retry_timer);
47 priv->retry_timer = 0;
48- g_variant_unref(priv->retry_data);
49- priv->retry_data = NULL;
50- g_free(priv->retry_name);
51- priv->retry_name = NULL;
52 }
53
54 return;
55@@ -331,11 +318,6 @@
56 if (priv->retry_timer == 0) {
57 g_debug("Setting up retry timer");
58 priv->retry_timer = g_timeout_add_seconds(1, retry_event, user_data);
59-
60- priv->retry_id = dbusmenu_menuitem_get_id(mi);
61- priv->retry_name = g_strdup(event);
62- priv->retry_data = g_variant_ref(evdata);
63- priv->retry_timestamp = timestamp;
64 }
65
66 return;

Subscribers

People subscribed via source and target branches