← Back to branch summary

~bcurtiswx/ubuntu/precise/empathy/3.4.2.1-0ubuntu1

« back to all changes in this revision

Viewing changes to src/empathy-accounts.c

  • Committer: Package Import Robot
  • Author(s): Ken VanDine
  • Date: 2012-03-05 15:14:36 UTC
  • mfrom: (1.1.87)
  • Revision ID: package-import@ubuntu.com-20120305151436-utnrdabb2ppp3kw1
Tags: 3.3.90.2-0ubuntu1
* New upstream release
* debian/control
  - added yelp-tools and libfarstream-0.1-dev build depends
  - bump build depends on libtelepathy-farstream-dev, and 
    libtelepathy-glib-dev
  - bumpded depends for telepathy-mission-control-5
  - removed telepathy-butterfly recommends, mission-control-5 ensures 
    telepathy-haze handles MSN now.
* debian/rules
  - enable empathy-av 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/empathy-accounts.c
43
43
#include "empathy-accounts.h"
44
44
#include "empathy-accounts-common.h"
45
45
#include "empathy-accounts-dialog.h"
46
 
#include "empathy-account-assistant.h"
47
 
#include "empathy-auto-salut-account-helper.h"
48
46
 
49
47
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
50
48
#include <libempathy/empathy-debug.h>
54
52
static gboolean only_if_needed = FALSE;
55
53
static gboolean hidden = FALSE;
56
54
static gchar *selected_account_name = NULL;
57
 
static gboolean assistant = FALSE;
58
55
 
59
56
static void
60
57
maybe_show_accounts_ui (TpAccountManager *manager,
66
63
  if (only_if_needed && empathy_accounts_has_non_salut_accounts (manager))
67
64
    return;
68
65
 
69
 
  empathy_accounts_show_accounts_ui (manager, NULL, assistant, app);
 
66
  empathy_accounts_show_accounts_ui (manager, NULL, app);
70
67
}
71
68
 
72
69
static TpAccount *
123
120
 
124
121
      if (account != NULL)
125
122
        {
126
 
          empathy_accounts_show_accounts_ui (manager, account, assistant, app);
 
123
          empathy_accounts_show_accounts_ui (manager, account, app);
127
124
          goto out;
128
125
        }
129
126
      else
191
188
        N_("Initially select given account (eg, "
192
189
            "gabble/jabber/foo_40example_2eorg0)"),
193
190
        N_("<account-id>") },
194
 
      { "assistant", 'a',
195
 
        0, G_OPTION_ARG_NONE, &assistant,
196
 
        N_("Show account assistant"),
197
 
        NULL },
198
191
 
199
192
      { NULL }
200
193
  };