The Me Menu

Merge lp:~dbarth/indicator-me/add-account-entries-if-programs-present into lp:indicator-me

  1. add-account-entries-if-programs-present
  2. Merge into trunk
Proposed by David Barth
Status: Merged
Approved by: David Barth
Approved revision: 82
Merge reported by: David Barth
Merged at revision: not available
Proposed branch: lp:~dbarth/indicator-me/add-account-entries-if-programs-present
Merge into: lp:indicator-me
Diff against target: 85 lines (+38/-23)
2 files modified
src/me-service-gwibber.c (+0/-1)
src/me-service.c (+38/-22)
To merge this branch: bzr merge lp:~dbarth/indicator-me/add-account-entries-if-programs-present
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+21055@code.launchpad.net

Description of the change

add account setup entries only if programs present

To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :
Download full text (4.0 KiB)

Not sure why you removed the return in me-service-gwibber.c ;)

  review approve

On Wed, 2010-03-10 at 14:43 +0000, David Barth wrote:
> David Barth has proposed merging lp:~dbarth/indicator-me/add-account-entries-if-programs-present into lp:indicator-me.
>
> Requested reviews:
> Indicator Applet Developers (indicator-applet-developers)
>
>
> add account setup entries only if programs present
> differences between files attachment (review-diff.txt)
> === modified file 'src/me-service-gwibber.c'
> --- src/me-service-gwibber.c 2010-02-04 20:52:03 +0000
> +++ src/me-service-gwibber.c 2010-03-10 14:43:13 +0000
> @@ -82,4 +82,3 @@
>
> return;
> }
> -
>
> === modified file 'src/me-service.c'
> --- src/me-service.c 2010-02-25 18:26:01 +0000
> +++ src/me-service.c 2010-03-10 14:43:13 +0000
> @@ -155,34 +155,50 @@
> }
> }
>
> +static gboolean
> +program_is_installed (gchar *program)
> +{
> + gchar *cmd = g_find_program_in_path(program);
> + if (cmd != NULL) {
> + g_free(cmd);
> + return TRUE;
> + }
> +
> + return FALSE;
> +}
> +
> static void
> build_accounts_menuitems (gpointer data)
> {
> DbusmenuMenuitem * root = DBUSMENU_MENUITEM(data);
> g_return_if_fail(root != NULL);
>
> - /* FIXME: find cmd line parameters with ken-vandine */
> - DbusmenuMenuitem *im_accounts_mi = dbusmenu_menuitem_new();
> - dbusmenu_menuitem_property_set(im_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
> - _("Chat Accounts..."));
> - dbusmenu_menuitem_child_append(root, im_accounts_mi);
> - g_signal_connect(G_OBJECT(im_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
> - G_CALLBACK(spawn_on_activate_cb), "empathy-accounts");
> -
> - DbusmenuMenuitem *tw_accounts_mi = dbusmenu_menuitem_new();
> - dbusmenu_menuitem_property_set(tw_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
> - _("Broadcast Accounts..."));
> - dbusmenu_menuitem_child_append(root, tw_accounts_mi);
> - g_signal_connect(G_OBJECT(tw_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
> - G_CALLBACK(spawn_on_activate_cb), "gwibber-accounts");
> -
> - DbusmenuMenuitem *u1_accounts_mi = dbusmenu_menuitem_new();
> - dbusmenu_menuitem_property_set(u1_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
> - _("Ubuntu One..."));
> - dbusmenu_menuitem_child_append(root, u1_accounts_mi);
> - g_signal_connect(G_OBJECT(u1_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
> - G_CALLBACK(spawn_on_activate_cb), "ubuntuone-preferences");
> -
> + if (program_is_installed ("empathy-accounts")) {
> + DbusmenuMenuitem *im_accounts_mi = dbusmenu_menuitem_new();
> + dbusmenu_menuitem_property_set(im_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
> + _("Chat Accounts..."));
> + dbusmenu_menuitem_child_append(root, im_accounts_mi);
> + g_signal_connect(G_OBJECT(im_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
> + G_CALLBACK(spawn_on_activate_cb), "empathy-accounts");
> + }
> +
> + if (program_is_installed ("gwibber-accounts")) {
> + DbusmenuMenuitem *tw_accounts_mi = dbusmenu_menuitem_n...

Read more...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/me-service-gwibber.c'
2--- src/me-service-gwibber.c 2010-02-04 20:52:03 +0000
3+++ src/me-service-gwibber.c 2010-03-10 14:43:22 +0000
4@@ -82,4 +82,3 @@
5
6 return;
7 }
8-
9
10=== modified file 'src/me-service.c'
11--- src/me-service.c 2010-02-25 18:26:01 +0000
12+++ src/me-service.c 2010-03-10 14:43:22 +0000
13@@ -155,34 +155,50 @@
14 }
15 }
16
17+static gboolean
18+program_is_installed (gchar *program)
19+{
20+ gchar *cmd = g_find_program_in_path(program);
21+ if (cmd != NULL) {
22+ g_free(cmd);
23+ return TRUE;
24+ }
25+
26+ return FALSE;
27+}
28+
29 static void
30 build_accounts_menuitems (gpointer data)
31 {
32 DbusmenuMenuitem * root = DBUSMENU_MENUITEM(data);
33 g_return_if_fail(root != NULL);
34
35- /* FIXME: find cmd line parameters with ken-vandine */
36- DbusmenuMenuitem *im_accounts_mi = dbusmenu_menuitem_new();
37- dbusmenu_menuitem_property_set(im_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
38- _("Chat Accounts..."));
39- dbusmenu_menuitem_child_append(root, im_accounts_mi);
40- g_signal_connect(G_OBJECT(im_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
41- G_CALLBACK(spawn_on_activate_cb), "empathy-accounts");
42-
43- DbusmenuMenuitem *tw_accounts_mi = dbusmenu_menuitem_new();
44- dbusmenu_menuitem_property_set(tw_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
45- _("Broadcast Accounts..."));
46- dbusmenu_menuitem_child_append(root, tw_accounts_mi);
47- g_signal_connect(G_OBJECT(tw_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
48- G_CALLBACK(spawn_on_activate_cb), "gwibber-accounts");
49-
50- DbusmenuMenuitem *u1_accounts_mi = dbusmenu_menuitem_new();
51- dbusmenu_menuitem_property_set(u1_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
52- _("Ubuntu One..."));
53- dbusmenu_menuitem_child_append(root, u1_accounts_mi);
54- g_signal_connect(G_OBJECT(u1_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
55- G_CALLBACK(spawn_on_activate_cb), "ubuntuone-preferences");
56-
57+ if (program_is_installed ("empathy-accounts")) {
58+ DbusmenuMenuitem *im_accounts_mi = dbusmenu_menuitem_new();
59+ dbusmenu_menuitem_property_set(im_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
60+ _("Chat Accounts..."));
61+ dbusmenu_menuitem_child_append(root, im_accounts_mi);
62+ g_signal_connect(G_OBJECT(im_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
63+ G_CALLBACK(spawn_on_activate_cb), "empathy-accounts");
64+ }
65+
66+ if (program_is_installed ("gwibber-accounts")) {
67+ DbusmenuMenuitem *tw_accounts_mi = dbusmenu_menuitem_new();
68+ dbusmenu_menuitem_property_set(tw_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
69+ _("Broadcast Accounts..."));
70+ dbusmenu_menuitem_child_append(root, tw_accounts_mi);
71+ g_signal_connect(G_OBJECT(tw_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
72+ G_CALLBACK(spawn_on_activate_cb), "gwibber-accounts");
73+ }
74+
75+ if (program_is_installed ("ubuntuone-preferences")) {
76+ DbusmenuMenuitem *u1_accounts_mi = dbusmenu_menuitem_new();
77+ dbusmenu_menuitem_property_set(u1_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
78+ _("Ubuntu One..."));
79+ dbusmenu_menuitem_child_append(root, u1_accounts_mi);
80+ g_signal_connect(G_OBJECT(u1_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
81+ G_CALLBACK(spawn_on_activate_cb), "ubuntuone-preferences");
82+ }
83 }
84
85 static gboolean

Subscribers

People subscribed via source and target branches