aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-11 20:35:53 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-02-12 00:01:37 +0800
commitaba09644412809a256dc1b8b570022c772e3009d (patch)
treed8508eb778c7511861ea771bae4fee7622c4f130
parentd5c50301939772d752c7f8789a9b5ae81334fab3 (diff)
downloadgsoc2013-empathy-aba09644412809a256dc1b8b570022c772e3009d.tar.gz
gsoc2013-empathy-aba09644412809a256dc1b8b570022c772e3009d.tar.zst
gsoc2013-empathy-aba09644412809a256dc1b8b570022c772e3009d.zip
account-widget: display facebook example label
-rw-r--r--libempathy-gtk/empathy-account-widget.c25
1 files changed, 21 insertions, 4 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 25f8e0f70..1681d4539 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -940,6 +940,15 @@ account_widget_is_gtalk (EmpathyAccountWidget *self)
"im-google-talk");
}
+static gboolean
+account_widget_is_facebook (EmpathyAccountWidget *self)
+{
+ EmpathyAccountWidgetPriv *priv = GET_PRIV (self);
+
+ return !tp_strdiff (empathy_account_settings_get_icon_name (priv->settings),
+ "im-facebook");
+}
+
static void
account_widget_build_jabber (EmpathyAccountWidget *self,
const char *filename)
@@ -949,12 +958,13 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
GtkWidget *checkbutton_ssl;
GtkWidget *label_id, *label_password;
GtkWidget *label_id_create, *label_password_create;
- GtkWidget *label_example_gtalk, *label_example_jabber;
- gboolean is_gtalk;
+ GtkWidget *label_example_gtalk, *label_example_jabber, *label_example_fb;
+ gboolean is_gtalk, is_facebook;
is_gtalk = account_widget_is_gtalk (self);
+ is_facebook = account_widget_is_facebook (self);
- if (priv->simple && !is_gtalk)
+ if (priv->simple && !is_gtalk && !is_facebook)
{
/* Simple widget for XMPP */
self->ui_details->gui = empathy_builder_get_file (filename,
@@ -994,9 +1004,10 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
self->ui_details->default_focus = g_strdup ("entry_id_g_simple");
}
+ /* TODO: Simple widget for Facebook */
else
{
- /* Full widget for XMPP and Google Talk */
+ /* Full widget for XMPP, Google Talk and Facebook*/
self->ui_details->gui = empathy_builder_get_file (filename,
"table_common_settings", &priv->table_common_settings,
"vbox_jabber_settings", &self->ui_details->widget,
@@ -1004,6 +1015,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
"checkbutton_ssl", &checkbutton_ssl,
"label_username_example", &label_example_jabber,
"label_username_g_example", &label_example_gtalk,
+ "label_username_f_example", &label_example_fb,
NULL);
empathy_account_widget_handle_params (self,
@@ -1031,6 +1043,11 @@ account_widget_build_jabber (EmpathyAccountWidget *self,
gtk_widget_hide (label_example_jabber);
gtk_widget_show (label_example_gtalk);
}
+ else if (is_facebook)
+ {
+ gtk_widget_hide (label_example_jabber);
+ gtk_widget_show (label_example_fb);
+ }
}
}
4 * update to beta4oliver2004-12-042-3/+3 * update to beta3oliver2004-11-172-3/+3 * update to 1.0.0.b.2oliver2004-11-092-3/+3 * update to 1.0.0.b.1oliver2004-11-012-4/+5 * update to 0.9.99oliver2004-10-212-4/+4 * fetch & Install sylpheed-mime.types to send attached Files with a propperoliver2004-07-133-5/+15 * update to 0.9.12oliver2004-06-182-3/+3 * update to 0.9.11oliver2004-05-303-15/+3 * - Utilize USE_ICONVkrion2004-03-311-2/+1 * Whoa there, boy, that's a mighty big commit y'all have there...ade2004-03-141-1/+1 * uptdate to sylpheed 0.9.10oliver2004-03-014-3/+17 * Add USE_GETTEXT and bump PORTREVISION.marcus2004-02-041-3/+3 * revert the last change. gtk depends on gettext-old, and gettext+gettext conflictoliver2004-01-311-2/+2 * update gettext dependencyoliver2004-01-311-2/+2 * update sylpheed to 0.9.9oliver2004-01-303-3/+3 * Now gettext 0.12.1 is gettext-old.trevor2004-01-241-1/+1 * update sylpheed to 0.9.8.1 (0.9.8a)oliver2003-12-153-13/+3 * update sylpheed to 0.9.8oliver2003-12-133-3/+14 * utilize USE_OPENLDAPoliver2003-11-221-2/+2 * bump PORTREVISIONoliver2003-10-281-1/+1 * Does not use the included version of libintl, use the one which is providedoliver2003-10-282-4/+7 * update to 0.9.7oliver2003-10-152-2/+2 * Move USE_* above bsd.port.pre.mk.oliver2003-10-031-3/+10 * update sylpheed to 0.9.6oliver2003-09-252-2/+2 * Fix non-default dependency on openldap2[012] which is broken by splitting.kuriyama2003-08-151-1/+1 * update sylpheed to 0.9.4oliver2003-07-262-4/+6 * update sylpheed to 0.9.3oliver2003-07-063-83/+83 * libtool uber-patchade2003-06-271-1/+1 * update sylpheed to 0.9.2oliver2003-06-092-2/+2 * update sylpheed to 0.9.1oliver2003-06-042-2/+2 * Update sylpheed to 0.9.0oliver2003-05-162-4/+3 * update sylpheed to 0.9.0pre1oliver2003-05-153-3/+5 * redefine the MAINTAINER field with my FreeBSD addressoliver2003-05-071-1/+1 * USE_IMLIB is deprecated. Switching all USE_IMLIB references to appropriateadamw2003-04-211-3/+3 * Update to 0.8.11.nork2003-03-233-5/+6 * Point dependencies on net/openldap2 to net/openldap20edwin2003-02-241-1/+1 * De-pkg-comment.knu2003-02-212-1/+1 * Update to 0.8.10.nork2003-02-042-2/+2 * use iconv instead of libjconv.nork2003-01-311-8/+0 * Update to 0.8.9arved2003-01-192-2/+2 * Update to 0.8.8arved2003-01-033-3/+5 * Maintainer update.alane2002-11-242-73/+88 * Update to 0.8.6arved2002-11-162-2/+2 * Use bsd.port.(pre|post).mkarved2002-11-031-1/+3 * Update to 0.8.5pat2002-10-062-2/+2 * upgrade to 0.8.3ijliao2002-09-202-3/+3 * bump gpgme shlib versionijliao2002-09-201-1/+2 * Chase the pisock shared lib version number. Note, this new version maymarcus2002-09-181-1/+1 * Update to version 0.8.2kevlo2002-08-282-2/+2 * Update to 0.8.1pat2002-07-272-2/+2 * Update to 0.8.0pat2002-07-152-3/+4 * Update to 0.7.8pat2002-06-152-2/+2 * Update to 0.77.petef2002-06-103-3/+4 * Update to 0.7.6pat2002-05-143-4/+19 * Upgrade to version 0.7.5.demon2002-04-212-2/+2 * Update to 0.7.4pat2002-03-103-5/+18 * Chase checksum - updated translation file da.popat2002-03-091-1/+1 * Update to 0.7.3pat2002-03-043-2/+3 * - Update to 0.7.2pat2002-02-192-3/+3 * Update to 0.7.1pat2002-02-122-2/+2 * chase libgpgme libversion.sf2002-01-221-1/+1 * Add knob to enable LDAP support, no PORTREVISION bump required.pat2002-01-211-0/+11 * - Fix dependspat2002-01-181-5/+5 * Update to 0.7.0pat2002-01-093-24/+53 * Update to version 0.6.6kevlo2001-12-173-3/+6 * - Don't use automake/autoconf, because it requires to many patcheskevlo2001-11-282-18/+3 * Update to 0.6.5dwcjr2001-11-252-5/+5 * Style police: WWW tags should either end in a file/script or TRAILING /; Fix ...lioux2001-11-211-1/+1 * Fix build if WITH_GPGME is not defined.petef2001-11-061-0/+2 * Update to 0.6.4alex2001-11-011-0/+11 * - Update to 0.6.4.alex2001-11-012-4/+11 * upgrade to 0.6.3ijliao2001-10-113-2/+3 * Update to 0.6.2.alex2001-09-192-3/+2 * Add OpenSSL (defaults to on) and GnuPG support (experimental, defaultsalex2001-09-142-3/+39 * Upgrade to 0.6.1demon2001-09-033-2/+3 * - update to 0.6.0petef2001-09-026-26/+49 * upgrade to 0.4.66ijliao2001-05-092-2/+2 * Upgrade to version 0.4.64kevlo2001-04-302-2/+2 * Update to 0.4.63, by maintainerdougb2001-04-163-2/+6 * Update to version 0.4.62kevlo2001-03-202-2/+2 * Upgrade to version 0.4.61kevlo2001-02-203-2/+4 * Upgrade to 0.4.9kevlo2001-01-103-2/+5 * add missing message catalogue.sf2001-01-041-0/+1 * Update to version 0.4.4kevlo2000-11-153-12/+5 * Update to 0.4.2nakai2000-10-183-5/+6 * Implement WANT_IMLIB and USE_IMLIB.reg2000-10-051-9/+2 * Update to version 0.4.1.dannyboy2000-09-304-16/+23 * Update to 0.4.0nakai2000-09-283-3/+28 * Update to version 0.3.27.steve2000-09-052-2/+2 * Upgrade to Ver.0.3.20 .sada2000-07-024-6/+6 * Update to 0.3.18nakai2000-06-192-2/+2 * Update to 0.3.17nakai2000-06-162-2/+2 * Update to 0.3.14nakai2000-06-062-2/+2