aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Kaser <f.kaser@gmx.net>2009-12-15 20:28:28 +0800
committerFelix Kaser <f.kaser@gmx.net>2009-12-15 20:52:46 +0800
commit881ee2e637f50afaaba49447d428632233676279 (patch)
tree70f684537bc9ad3b022b2c858df420e12225a3f9
parentefa5be890a30290f23e0d460932ebd41504fa973 (diff)
downloadgsoc2013-empathy-881ee2e637f50afaaba49447d428632233676279.tar
gsoc2013-empathy-881ee2e637f50afaaba49447d428632233676279.tar.gz
gsoc2013-empathy-881ee2e637f50afaaba49447d428632233676279.tar.bz2
gsoc2013-empathy-881ee2e637f50afaaba49447d428632233676279.tar.lz
gsoc2013-empathy-881ee2e637f50afaaba49447d428632233676279.tar.xz
gsoc2013-empathy-881ee2e637f50afaaba49447d428632233676279.tar.zst
gsoc2013-empathy-881ee2e637f50afaaba49447d428632233676279.zip
dont show infobar when creating an account
-rw-r--r--src/empathy-accounts-dialog.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index 187d8c71c..f9ad79a1b 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -179,7 +179,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
{
EmpathyAccountsDialogPriv *priv = GET_PRIV (dialog);
const gchar *message;
- gchar *status_message;
+ gchar *status_message = NULL;
guint status;
guint reason;
guint presence;
@@ -203,9 +203,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
/* do not update the infobar when the account is not selected */
if (account != selected_account)
- {
- return;
- }
+ return;
if (account != NULL)
{
@@ -294,14 +292,7 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
}
else
{
- if (creating_account)
- {
- message = _("Offline - Account not created yet");
- }
- else
- {
- message = _("Offline - Account disabled");
- }
+ message = _("Offline - Account disabled");
gtk_info_bar_set_message_type (GTK_INFO_BAR (priv->infobar),
GTK_MESSAGE_WARNING);
@@ -312,10 +303,13 @@ accounts_dialog_update_status_infobar (EmpathyAccountsDialog *dialog,
gtk_label_set_text (GTK_LABEL (priv->label_status), message);
gtk_widget_show (priv->label_status);
- gtk_widget_show (priv->infobar);
if (!creating_account)
- g_free (status_message);
+ gtk_widget_show (priv->infobar);
+ else
+ gtk_widget_hide (priv->infobar);
+
+ g_free (status_message);
}
static void