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
=== 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:22 +0000
@@ -82,4 +82,3 @@
8282
83 return;83 return;
84}84}
85
8685
=== 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:22 +0000
@@ -155,34 +155,50 @@
155 }155 }
156}156}
157157
158static gboolean
159program_is_installed (gchar *program)
160{
161 gchar *cmd = g_find_program_in_path(program);
162 if (cmd != NULL) {
163 g_free(cmd);
164 return TRUE;
165 }
166
167 return FALSE;
168}
169
158static void170static void
159build_accounts_menuitems (gpointer data)171build_accounts_menuitems (gpointer data)
160{172{
161 DbusmenuMenuitem * root = DBUSMENU_MENUITEM(data);173 DbusmenuMenuitem * root = DBUSMENU_MENUITEM(data);
162 g_return_if_fail(root != NULL);174 g_return_if_fail(root != NULL);
163175
164 /* FIXME: find cmd line parameters with ken-vandine */176 if (program_is_installed ("empathy-accounts")) {
165 DbusmenuMenuitem *im_accounts_mi = dbusmenu_menuitem_new();177 DbusmenuMenuitem *im_accounts_mi = dbusmenu_menuitem_new();
166 dbusmenu_menuitem_property_set(im_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,178 dbusmenu_menuitem_property_set(im_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
167 _("Chat Accounts..."));179 _("Chat Accounts..."));
168 dbusmenu_menuitem_child_append(root, im_accounts_mi);180 dbusmenu_menuitem_child_append(root, im_accounts_mi);
169 g_signal_connect(G_OBJECT(im_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,181 g_signal_connect(G_OBJECT(im_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
170 G_CALLBACK(spawn_on_activate_cb), "empathy-accounts");182 G_CALLBACK(spawn_on_activate_cb), "empathy-accounts");
171183 }
172 DbusmenuMenuitem *tw_accounts_mi = dbusmenu_menuitem_new();184
173 dbusmenu_menuitem_property_set(tw_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,185 if (program_is_installed ("gwibber-accounts")) {
174 _("Broadcast Accounts..."));186 DbusmenuMenuitem *tw_accounts_mi = dbusmenu_menuitem_new();
175 dbusmenu_menuitem_child_append(root, tw_accounts_mi);187 dbusmenu_menuitem_property_set(tw_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
176 g_signal_connect(G_OBJECT(tw_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,188 _("Broadcast Accounts..."));
177 G_CALLBACK(spawn_on_activate_cb), "gwibber-accounts");189 dbusmenu_menuitem_child_append(root, tw_accounts_mi);
178190 g_signal_connect(G_OBJECT(tw_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
179 DbusmenuMenuitem *u1_accounts_mi = dbusmenu_menuitem_new();191 G_CALLBACK(spawn_on_activate_cb), "gwibber-accounts");
180 dbusmenu_menuitem_property_set(u1_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,192 }
181 _("Ubuntu One..."));193
182 dbusmenu_menuitem_child_append(root, u1_accounts_mi);194 if (program_is_installed ("ubuntuone-preferences")) {
183 g_signal_connect(G_OBJECT(u1_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,195 DbusmenuMenuitem *u1_accounts_mi = dbusmenu_menuitem_new();
184 G_CALLBACK(spawn_on_activate_cb), "ubuntuone-preferences");196 dbusmenu_menuitem_property_set(u1_accounts_mi, DBUSMENU_MENUITEM_PROP_LABEL,
185197 _("Ubuntu One..."));
198 dbusmenu_menuitem_child_append(root, u1_accounts_mi);
199 g_signal_connect(G_OBJECT(u1_accounts_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
200 G_CALLBACK(spawn_on_activate_cb), "ubuntuone-preferences");
201 }
186}202}
187203
188static gboolean204static gboolean

Subscribers

People subscribed via source and target branches