Merge lp://qastaging/~dbarth/indicator-me/add-account-entries-if-programs-present into lp://qastaging/indicator-me
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://qastaging/~dbarth/indicator-me/add-account-entries-if-programs-present |
Merge into: | lp://qastaging/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://qastaging/~dbarth/indicator-me/add-account-entries-if-programs-present |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ted Gould (community) | Approve | ||
Review via email: mp+21055@code.qastaging.launchpad.net |
Description of the change
add account setup entries only if programs present
To post a comment you must log in.
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: applet- developers) service- gwibber. c' service- gwibber. c 2010-02-04 20:52:03 +0000 service- gwibber. c 2010-03-10 14:43:13 +0000 is_installed (gchar *program) program_ in_path( program) ; menuitems (gpointer data) MENUITEM( data); if_fail( root != NULL); menuitem_ new(); menuitem_ property_ set(im_ accounts_ mi, DBUSMENU_ MENUITEM_ PROP_LABEL, menuitem_ child_append( root, im_accounts_mi); connect( G_OBJECT( im_accounts_ mi), DBUSMENU_ MENUITEM_ SIGNAL_ ITEM_ACTIVATED, spawn_on_ activate_ cb), "empathy- accounts" ); menuitem_ new(); menuitem_ property_ set(tw_ accounts_ mi, DBUSMENU_ MENUITEM_ PROP_LABEL, menuitem_ child_append( root, tw_accounts_mi); connect( G_OBJECT( tw_accounts_ mi), DBUSMENU_ MENUITEM_ SIGNAL_ ITEM_ACTIVATED, spawn_on_ activate_ cb), "gwibber- accounts" ); menuitem_ new(); menuitem_ property_ set(u1_ accounts_ mi, DBUSMENU_ MENUITEM_ PROP_LABEL, menuitem_ child_append( root, u1_accounts_mi); connect( G_OBJECT( u1_accounts_ mi), DBUSMENU_ MENUITEM_ SIGNAL_ ITEM_ACTIVATED, spawn_on_ activate_ cb), "ubuntuone- preferences" ); is_installed ("empathy- accounts" )) { menuitem_ new(); menuitem_ property_ set(im_ accounts_ mi, DBUSMENU_ MENUITEM_ PROP_LABEL, menuitem_ child_append( root, im_accounts_mi); connect( G_OBJECT( im_accounts_ mi), DBUSMENU_ MENUITEM_ SIGNAL_ ITEM_ACTIVATED, spawn_on_ activate_ cb), "empathy- accounts" ); is_installed ("gwibber- accounts" )) { menuitem_ n...
> 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-
>
>
> add account setup entries only if programs present
> differences between files attachment (review-diff.txt)
> === modified file 'src/me-
> --- src/me-
> +++ src/me-
> @@ -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_
> +{
> + gchar *cmd = g_find_
> + if (cmd != NULL) {
> + g_free(cmd);
> + return TRUE;
> + }
> +
> + return FALSE;
> +}
> +
> static void
> build_accounts_
> {
> DbusmenuMenuitem * root = DBUSMENU_
> g_return_
>
> - /* FIXME: find cmd line parameters with ken-vandine */
> - DbusmenuMenuitem *im_accounts_mi = dbusmenu_
> - dbusmenu_
> - _("Chat Accounts..."));
> - dbusmenu_
> - g_signal_
> - G_CALLBACK(
> -
> - DbusmenuMenuitem *tw_accounts_mi = dbusmenu_
> - dbusmenu_
> - _("Broadcast Accounts..."));
> - dbusmenu_
> - g_signal_
> - G_CALLBACK(
> -
> - DbusmenuMenuitem *u1_accounts_mi = dbusmenu_
> - dbusmenu_
> - _("Ubuntu One..."));
> - dbusmenu_
> - g_signal_
> - G_CALLBACK(
> -
> + if (program_
> + DbusmenuMenuitem *im_accounts_mi = dbusmenu_
> + dbusmenu_
> + _("Chat Accounts..."));
> + dbusmenu_
> + g_signal_
> + G_CALLBACK(
> + }
> +
> + if (program_
> + DbusmenuMenuitem *tw_accounts_mi = dbusmenu_