*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ *
* Authors: Xavier Claessens <xclaesse@gmail.com>
* Martyn Russell <martyn@imendio.com>
*/
#include <string.h>
#include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <libmissioncontrol/mc-account.h>
#include <libmissioncontrol/mc-protocol.h>
-#include <libempathy/empathy-debug.h>
#include <libempathy/empathy-utils.h>
#include "empathy-account-widget.h"
#include "empathy-ui-utils.h"
-#define DEBUG_DOMAIN "AccountWidget"
+#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
+#include <libempathy/empathy-debug.h>
-static gboolean
+static gboolean
account_widget_entry_focus_cb (GtkWidget *widget,
GdkEventFocus *event,
McAccount *account)
str = gtk_entry_get_text (GTK_ENTRY (widget));
param_name = g_object_get_data (G_OBJECT (widget), "param_name");
- if (G_STR_EMPTY (str)) {
+ if (EMP_STR_EMPTY (str)) {
gchar *value = NULL;
mc_account_unset_param (account, param_name);
mc_account_get_param_string (account, param_name, &value);
- empathy_debug (DEBUG_DOMAIN, "Unset %s and restore to %s", param_name, value);
+ DEBUG ("Unset %s and restore to %s", param_name, value);
gtk_entry_set_text (GTK_ENTRY (widget), value ? value : "");
g_free (value);
} else {
- empathy_debug (DEBUG_DOMAIN, "Setting %s to %s", param_name,
- strstr (param_name, "password") ? "***" : str);
+ McProfile *profile;
+ const gchar *domain = NULL;
+ gchar *dup_str = NULL;
+
+ profile = mc_account_get_profile (account);
+ if (mc_profile_get_capabilities (profile) &
+ MC_PROFILE_CAPABILITY_SPLIT_ACCOUNT) {
+ domain = mc_profile_get_default_account_domain (profile);
+ }
+
+ if (domain && !strstr (str, "@") &&
+ strcmp (param_name, "account") == 0) {
+ DEBUG ("Adding @%s suffix to account", domain);
+ str = dup_str = g_strconcat (str, "@", domain, NULL);
+ gtk_entry_set_text (GTK_ENTRY (widget), str);
+ }
+ DEBUG ("Setting %s to %s", param_name,
+ strstr (param_name, "password") ? "***" : str);
mc_account_set_param_string (account, param_name, str);
+ g_free (dup_str);
+ g_object_unref (profile);
}
return FALSE;
if (value == 0) {
mc_account_unset_param (account, param_name);
mc_account_get_param_int (account, param_name, &value);
- empathy_debug (DEBUG_DOMAIN, "Unset %s and restore to %d", param_name, value);
+ DEBUG ("Unset %s and restore to %d", param_name, value);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), value);
} else {
- empathy_debug (DEBUG_DOMAIN, "Setting %s to %d", param_name, value);
+ DEBUG ("Setting %s to %d", param_name, value);
mc_account_set_param_int (account, param_name, value);
}
}
-static void
+static void
account_widget_checkbutton_toggled_cb (GtkWidget *widget,
McAccount *account)
{
mc_account_get_param_boolean (account, param_name, &default_value);
if (default_value == value) {
- empathy_debug (DEBUG_DOMAIN, "Unset %s and restore to %d", param_name, default_value);
+ DEBUG ("Unset %s and restore to %d", param_name, default_value);
} else {
- empathy_debug (DEBUG_DOMAIN, "Setting %s to %d", param_name, value);
+ DEBUG ("Setting %s to %d", param_name, value);
mc_account_set_param_boolean (account, param_name, value);
}
}
param_name = g_object_get_data (G_OBJECT (entry), "param_name");
account = g_object_get_data (G_OBJECT (entry), "account");
- empathy_debug (DEBUG_DOMAIN, "Unset %s", param_name);
+ DEBUG ("Unset %s", param_name);
mc_account_unset_param (account, param_name);
gtk_entry_set_text (GTK_ENTRY (entry), "");
}
const gchar *str;
str = gtk_entry_get_text (GTK_ENTRY (entry));
- gtk_widget_set_sensitive (button, !G_STR_EMPTY (str));
+ gtk_widget_set_sensitive (button, !EMP_STR_EMPTY (str));
}
-static void
+static void
account_widget_jabber_ssl_toggled_cb (GtkWidget *checkbutton_ssl,
GtkWidget *spinbutton_port)
{
McAccount *account,
const gchar *param_name)
{
- g_object_set_data_full (G_OBJECT (widget), "param_name",
+ g_object_set_data_full (G_OBJECT (widget), "param_name",
g_strdup (param_name), g_free);
- g_object_set_data_full (G_OBJECT (widget), "account",
+ g_object_set_data_full (G_OBJECT (widget), "account",
g_object_ref (account), g_object_unref);
if (GTK_IS_SPIN_BUTTON (widget)) {
G_CALLBACK (account_widget_checkbutton_toggled_cb),
account);
} else {
- empathy_debug (DEBUG_DOMAIN,
- "Unknown type of widget for param %s",
- param_name);
+ DEBUG ("Unknown type of widget for param %s", param_name);
}
}
gchar *p;
str = g_strdup (param_name);
-
+
if (str && g_ascii_isalpha (str[0])) {
str[0] = g_ascii_toupper (str[0]);
}
-
+
while ((p = strchr (str, '-')) != NULL) {
if (p[1] != '\0' && g_ascii_isalpha (p[1])) {
p[0] = ' ';
p++;
}
-
+
return str;
}
if (!protocol) {
/* The CM is not installed, MC shouldn't list them
* see SF bug #1688779
- * FIXME: We should display something asking the user to
+ * FIXME: We should display something asking the user to
* install the CM
*/
g_object_unref (profile);
n_rows - 1, n_rows,
GTK_FILL, 0,
0, 0);
+ gtk_widget_show (widget);
widget = gtk_entry_new ();
+ if (strcmp (param->name, "account") == 0) {
+ g_signal_connect (widget, "realize",
+ G_CALLBACK (gtk_widget_grab_focus),
+ NULL);
+ }
gtk_table_attach (GTK_TABLE (table_settings),
widget,
1, 2,
n_rows - 1, n_rows,
GTK_FILL | GTK_EXPAND, 0,
0, 0);
+ gtk_widget_show (widget);
}
/* int types: ynqiuxt. double type is 'd' */
else if (param->signature[0] == 'y' ||
n_rows - 1, n_rows,
GTK_FILL, 0,
0, 0);
+ gtk_widget_show (widget);
widget = gtk_spin_button_new_with_range (minint, maxint, step);
gtk_table_attach (GTK_TABLE (table_settings),
n_rows - 1, n_rows,
GTK_FILL | GTK_EXPAND, 0,
0, 0);
+ gtk_widget_show (widget);
}
else if (param->signature[0] == 'b') {
widget = gtk_check_button_new_with_label (param_name_formatted);
n_rows - 1, n_rows,
GTK_FILL | GTK_EXPAND, 0,
0, 0);
+ gtk_widget_show (widget);
} else {
- empathy_debug (DEBUG_DOMAIN,
- "Unknown signature for param %s: %s",
- param_name_formatted, param->signature);
+ DEBUG ("Unknown signature for param %s: %s",
+ param_name_formatted, param->signature);
}
if (widget) {
static void
account_widget_handle_params_valist (McAccount *account,
- GladeXML *gui,
- const gchar *first_widget_name,
+ GtkBuilder *gui,
+ const gchar *first_widget,
va_list args)
{
- GtkWidget *widget;
- const gchar *widget_name;
+ GObject *object;
+ const gchar *name;
- for (widget_name = first_widget_name; widget_name; widget_name = va_arg (args, gchar*)) {
+ for (name = first_widget; name; name = va_arg (args, const gchar *)) {
const gchar *param_name;
- param_name = va_arg (args, gchar*);
-
- widget = glade_xml_get_widget (gui, widget_name);
+ param_name = va_arg (args, const gchar *);
+ object = gtk_builder_get_object (gui, name);
- if (!widget) {
- g_warning ("Glade is missing widget '%s'.", widget_name);
+ if (!object) {
+ g_warning ("Builder is missing object '%s'.", name);
continue;
}
- account_widget_setup_widget (widget, account, param_name);
+ account_widget_setup_widget (GTK_WIDGET (object), account, param_name);
}
}
void
empathy_account_widget_handle_params (McAccount *account,
- GladeXML *gui,
- const gchar *first_widget_name,
+ GtkBuilder *gui,
+ const gchar *first_widget,
...)
{
va_list args;
g_return_if_fail (MC_IS_ACCOUNT (account));
+ g_return_if_fail (GTK_IS_BUILDER (gui));
- va_start (args, first_widget_name);
- account_widget_handle_params_valist (account, gui,
- first_widget_name,
- args);
+ va_start (args, first_widget);
+ account_widget_handle_params_valist (account, gui, first_widget, args);
va_end (args);
}
void
empathy_account_widget_add_forget_button (McAccount *account,
- GladeXML *glade,
+ GtkBuilder *gui,
const gchar *button,
const gchar *entry)
{
GtkWidget *button_forget;
GtkWidget *entry_password;
- gchar *password = NULL;
-
- button_forget = glade_xml_get_widget (glade, button);
- entry_password = glade_xml_get_widget (glade, entry);
+ gchar *password = NULL;
+
+ button_forget = GTK_WIDGET (gtk_builder_get_object (gui, button));
+ entry_password = GTK_WIDGET (gtk_builder_get_object (gui, entry));
mc_account_get_param_string (account, "password", &password);
- gtk_widget_set_sensitive (button_forget, !G_STR_EMPTY (password));
+ gtk_widget_set_sensitive (button_forget, !EMP_STR_EMPTY (password));
g_free (password);
g_signal_connect (button_forget, "clicked",
button_forget);
}
+void
+empathy_account_widget_set_default_focus (GtkBuilder *gui,
+ const gchar *entry)
+{
+ GObject *default_focus_entry;
+
+ default_focus_entry = gtk_builder_get_object (gui, entry);
+ g_signal_connect (default_focus_entry, "realize",
+ G_CALLBACK (gtk_widget_grab_focus),
+ NULL);
+}
+
GtkWidget *
empathy_account_widget_generic_new (McAccount *account)
{
- GladeXML *glade;
+ GtkBuilder *gui;
GtkWidget *widget;
GtkWidget *table_common_settings;
GtkWidget *table_advanced_settings;
g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
- filename = empathy_file_lookup ("empathy-account-widget-generic.glade",
+ filename = empathy_file_lookup ("empathy-account-widget-generic.ui",
"libempathy-gtk");
- glade = empathy_glade_get_file (filename,
- "vbox_generic_settings",
- NULL,
+ gui = empathy_builder_get_file (filename,
"vbox_generic_settings", &widget,
"table_common_settings", &table_common_settings,
"table_advanced_settings", &table_advanced_settings,
accounts_widget_generic_setup (account, table_common_settings, table_advanced_settings);
- g_object_unref (glade);
-
- gtk_widget_show_all (widget);
-
- return widget;
+ return empathy_builder_unref_and_keep_widget (gui, widget);
}
GtkWidget *
empathy_account_widget_salut_new (McAccount *account)
{
- GladeXML *glade;
+ GtkBuilder *gui;
GtkWidget *widget;
gchar *filename;
- filename = empathy_file_lookup ("empathy-account-widget-salut.glade",
+ filename = empathy_file_lookup ("empathy-account-widget-salut.ui",
"libempathy-gtk");
- glade = empathy_glade_get_file (filename,
- "vbox_salut_settings",
- NULL,
+ gui = empathy_builder_get_file (filename,
"vbox_salut_settings", &widget,
NULL);
g_free (filename);
- empathy_account_widget_handle_params (account, glade,
+ empathy_account_widget_handle_params (account, gui,
"entry_published", "published-name",
"entry_nickname", "nickname",
"entry_first_name", "first-name",
"entry_jid", "jid",
NULL);
- g_object_unref (glade);
-
- gtk_widget_show (widget);
+ empathy_account_widget_set_default_focus (gui, "entry_nickname");
- return widget;
+ return empathy_builder_unref_and_keep_widget (gui, widget);
}
GtkWidget *
empathy_account_widget_msn_new (McAccount *account)
{
- GladeXML *glade;
+ GtkBuilder *gui;
GtkWidget *widget;
gchar *filename;
- filename = empathy_file_lookup ("empathy-account-widget-msn.glade",
+ filename = empathy_file_lookup ("empathy-account-widget-msn.ui",
"libempathy-gtk");
- glade = empathy_glade_get_file (filename,
- "vbox_msn_settings",
- NULL,
+ gui = empathy_builder_get_file (filename,
"vbox_msn_settings", &widget,
NULL);
g_free (filename);
- empathy_account_widget_handle_params (account, glade,
+ empathy_account_widget_handle_params (account, gui,
"entry_id", "account",
"entry_password", "password",
"entry_server", "server",
"spinbutton_port", "port",
NULL);
- empathy_account_widget_add_forget_button (account, glade,
+ empathy_account_widget_add_forget_button (account, gui,
"button_forget",
"entry_password");
- g_object_unref (glade);
+ empathy_account_widget_set_default_focus (gui, "entry_id");
- gtk_widget_show (widget);
-
- return widget;
+ return empathy_builder_unref_and_keep_widget (gui, widget);
}
GtkWidget *
empathy_account_widget_jabber_new (McAccount *account)
{
- GladeXML *glade;
+ GtkBuilder *gui;
GtkWidget *widget;
GtkWidget *spinbutton_port;
GtkWidget *checkbutton_ssl;
gchar *filename;
- filename = empathy_file_lookup ("empathy-account-widget-jabber.glade",
+ filename = empathy_file_lookup ("empathy-account-widget-jabber.ui",
"libempathy-gtk");
- glade = empathy_glade_get_file (filename,
- "vbox_jabber_settings",
- NULL,
+ gui = empathy_builder_get_file (filename,
"vbox_jabber_settings", &widget,
"spinbutton_port", &spinbutton_port,
"checkbutton_ssl", &checkbutton_ssl,
NULL);
g_free (filename);
- empathy_account_widget_handle_params (account, glade,
+ empathy_account_widget_handle_params (account, gui,
"entry_id", "account",
"entry_password", "password",
"entry_resource", "resource",
"checkbutton_encryption", "require-encryption",
NULL);
- empathy_account_widget_add_forget_button (account, glade,
+ empathy_account_widget_add_forget_button (account, gui,
"button_forget",
"entry_password");
+ empathy_account_widget_set_default_focus (gui, "entry_id");
+
g_signal_connect (checkbutton_ssl, "toggled",
G_CALLBACK (account_widget_jabber_ssl_toggled_cb),
spinbutton_port);
- g_object_unref (glade);
-
- gtk_widget_show (widget);
-
- return widget;
+ return empathy_builder_unref_and_keep_widget (gui, widget);
}
GtkWidget *
empathy_account_widget_icq_new (McAccount *account)
{
- GladeXML *glade;
+ GtkBuilder *gui;
GtkWidget *widget;
GtkWidget *spinbutton_port;
gchar *filename;
- filename = empathy_file_lookup ("empathy-account-widget-icq.glade",
+ filename = empathy_file_lookup ("empathy-account-widget-icq.ui",
"libempathy-gtk");
- glade = empathy_glade_get_file (filename,
- "vbox_icq_settings",
- NULL,
+ gui = empathy_builder_get_file (filename,
"vbox_icq_settings", &widget,
"spinbutton_port", &spinbutton_port,
NULL);
g_free (filename);
- empathy_account_widget_handle_params (account, glade,
+ empathy_account_widget_handle_params (account, gui,
"entry_uin", "account",
"entry_password", "password",
"entry_server", "server",
"entry_charset", "charset",
NULL);
- empathy_account_widget_add_forget_button (account, glade,
+ empathy_account_widget_add_forget_button (account, gui,
"button_forget",
"entry_password");
- g_object_unref (glade);
+ empathy_account_widget_set_default_focus (gui, "entry_uin");
- gtk_widget_show (widget);
-
- return widget;
+ return empathy_builder_unref_and_keep_widget (gui, widget);
}
GtkWidget *
empathy_account_widget_aim_new (McAccount *account)
{
- GladeXML *glade;
+ GtkBuilder *gui;
GtkWidget *widget;
GtkWidget *spinbutton_port;
gchar *filename;
- filename = empathy_file_lookup ("empathy-account-widget-aim.glade",
+ filename = empathy_file_lookup ("empathy-account-widget-aim.ui",
"libempathy-gtk");
- glade = empathy_glade_get_file (filename,
- "vbox_aim_settings",
- NULL,
+ gui = empathy_builder_get_file (filename,
"vbox_aim_settings", &widget,
"spinbutton_port", &spinbutton_port,
NULL);
g_free (filename);
- empathy_account_widget_handle_params (account, glade,
+ empathy_account_widget_handle_params (account, gui,
"entry_screenname", "account",
"entry_password", "password",
"entry_server", "server",
"spinbutton_port", "port",
NULL);
- empathy_account_widget_add_forget_button (account, glade,
+ empathy_account_widget_add_forget_button (account, gui,
"button_forget",
"entry_password");
- g_object_unref (glade);
-
- gtk_widget_show (widget);
+ empathy_account_widget_set_default_focus (gui, "entry_screenname");
- return widget;
+ return empathy_builder_unref_and_keep_widget (gui, widget);
}
GtkWidget *
empathy_account_widget_yahoo_new (McAccount *account)
{
- GladeXML *glade;
+ GtkBuilder *gui;
GtkWidget *widget;
gchar *filename;
- filename = empathy_file_lookup ("empathy-account-widget-yahoo.glade",
+ filename = empathy_file_lookup ("empathy-account-widget-yahoo.ui",
"libempathy-gtk");
- glade = empathy_glade_get_file (filename,
- "vbox_yahoo_settings",
- NULL,
+ gui = empathy_builder_get_file (filename,
"vbox_yahoo_settings", &widget,
NULL);
g_free (filename);
- empathy_account_widget_handle_params (account, glade,
+ empathy_account_widget_handle_params (account, gui,
"entry_id", "account",
"entry_password", "password",
"entry_server", "server",
- "entry_serverjp", "serverjp",
"entry_locale", "room-list-locale",
"entry_charset", "charset",
"spinbutton_port", "port",
"checkbutton_ignore_invites", "ignore-invites",
NULL);
- empathy_account_widget_add_forget_button (account, glade,
+ empathy_account_widget_add_forget_button (account, gui,
"button_forget",
"entry_password");
- g_object_unref (glade);
+ empathy_account_widget_set_default_focus (gui, "entry_id");
- gtk_widget_show (widget);
-
- return widget;
+ return empathy_builder_unref_and_keep_widget (gui, widget);
}
GtkWidget *
empathy_account_widget_groupwise_new (McAccount *account)
{
- GladeXML *glade;
+ GtkBuilder *gui;
GtkWidget *widget;
gchar *filename;
- filename = empathy_file_lookup ("empathy-account-widget-groupwise.glade",
+ filename = empathy_file_lookup ("empathy-account-widget-groupwise.ui",
"libempathy-gtk");
- glade = empathy_glade_get_file (filename,
- "vbox_groupwise_settings",
- NULL,
+ gui = empathy_builder_get_file (filename,
"vbox_groupwise_settings", &widget,
NULL);
g_free (filename);
- empathy_account_widget_handle_params (account, glade,
+ empathy_account_widget_handle_params (account, gui,
"entry_id", "account",
"entry_password", "password",
"entry_server", "server",
"spinbutton_port", "port",
NULL);
- empathy_account_widget_add_forget_button (account, glade,
+ empathy_account_widget_add_forget_button (account, gui,
"button_forget",
"entry_password");
- g_object_unref (glade);
-
- gtk_widget_show (widget);
+ empathy_account_widget_set_default_focus (gui, "entry_id");
- return widget;
+ return empathy_builder_unref_and_keep_widget (gui, widget);
}
projects / empathy.git / blobdiff