/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
* Copyright (C) 2006-2007 Imendio AB
- * Copyright (C) 2007 Collabora Ltd.
+ * Copyright (C) 2007-2008 Collabora Ltd.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
#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
account_widget_entry_focus_cb (GtkWidget *widget,
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, 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;
const gchar *param_name;
gint value;
- value = gtk_spin_button_get_value (GTK_SPIN_BUTTON (widget));
+ value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
param_name = g_object_get_data (G_OBJECT (widget), "param_name");
if (value == 0) {
- gint val;
-
mc_account_unset_param (account, param_name);
- mc_account_get_param_int (account, param_name, &val);
- empathy_debug (DEBUG_DOMAIN, "Unset %s and restore to %d", param_name, val);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), val);
+ mc_account_get_param_int (account, 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, (gint) value);
- mc_account_set_param_int (account, param_name, (gint) value);
+ DEBUG ("Setting %s to %d", param_name, value);
+ mc_account_set_param_int (account, param_name, value);
}
}
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
gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinbutton_port), port);
}
-static void
-account_widget_destroy_cb (GtkWidget *widget,
- McAccount *account)
-{
- empathy_debug (DEBUG_DOMAIN, "destroyed!");
- g_object_unref (account);
-}
-
static void
account_widget_setup_widget (GtkWidget *widget,
McAccount *account,
{
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_ref (account), g_object_unref);
if (GTK_IS_SPIN_BUTTON (widget)) {
gint value = 0;
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);
}
}
static void
accounts_widget_generic_setup (McAccount *account,
- GtkWidget *table_settings)
+ GtkWidget *table_common_settings,
+ GtkWidget *table_advanced_settings)
{
McProtocol *protocol;
McProfile *profile;
GSList *params, *l;
- guint n_rows = 0;
profile = mc_account_get_profile (account);
protocol = mc_profile_get_protocol (profile);
for (l = params; l; l = l->next) {
McProtocolParam *param;
+ GtkWidget *table_settings;
+ guint n_rows = 0;
GtkWidget *widget = NULL;
gchar *param_name_formatted;
param = l->data;
+ if (param->flags & MC_PROTOCOL_PARAM_REQUIRED) {
+ table_settings = table_common_settings;
+ } else {
+ table_settings = table_advanced_settings;
+ }
param_name_formatted = account_widget_generic_format_param_name (param->name);
+ g_object_get (table_settings, "n-rows", &n_rows, NULL);
gtk_table_resize (GTK_TABLE (table_settings), ++n_rows, 2);
if (param->signature[0] == 's') {
GTK_FILL | GTK_EXPAND, 0,
0, 0);
} 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) {
g_object_unref (protocol);
}
-static GtkWidget *
-account_widget_new_valist (McAccount *account,
- GladeXML *gui,
- const gchar *root,
- const gchar *first_widget_name,
- va_list args)
+static void
+account_widget_handle_params_valist (McAccount *account,
+ GladeXML *gui,
+ const gchar *first_widget_name,
+ va_list args)
{
GtkWidget *widget;
const gchar *widget_name;
account_widget_setup_widget (widget, account, param_name);
}
-
- widget = glade_xml_get_widget (gui, root);
- g_signal_connect (widget, "destroy",
- G_CALLBACK (account_widget_destroy_cb),
- g_object_ref (account));
-
- return widget;
}
-GtkWidget *
-empathy_account_widget_new_with_glade (McAccount *account,
- GladeXML *gui,
- const gchar *root,
- const gchar *first_widget_name,
- ...)
+void
+empathy_account_widget_handle_params (McAccount *account,
+ GladeXML *gui,
+ const gchar *first_widget_name,
+ ...)
{
- GtkWidget *widget;
- va_list args;
+ va_list args;
- g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
+ g_return_if_fail (MC_IS_ACCOUNT (account));
va_start (args, first_widget_name);
- widget = account_widget_new_valist (account, gui, root,
- first_widget_name,
- args);
+ account_widget_handle_params_valist (account, gui,
+ first_widget_name,
+ args);
va_end (args);
-
- return widget;
}
void
-emapthy_account_widget_add_forget_button (McAccount *account,
+empathy_account_widget_add_forget_button (McAccount *account,
GladeXML *glade,
const gchar *button,
const gchar *entry)
entry_password = glade_xml_get_widget (glade, 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",
g_signal_connect (entry_password, "changed",
G_CALLBACK (account_widget_password_changed_cb),
button_forget);
-
- g_object_set_data_full (G_OBJECT (entry_password), "account",
- g_object_ref (account),
- g_object_unref);
}
GtkWidget *
empathy_account_widget_generic_new (McAccount *account)
{
- GtkWidget *table_settings;
- GtkWidget *sw;
+ GladeXML *glade;
+ GtkWidget *widget;
+ GtkWidget *table_common_settings;
+ GtkWidget *table_advanced_settings;
+ gchar *filename;
g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
- table_settings = gtk_table_new (0, 2, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table_settings), 6);
- gtk_table_set_col_spacings (GTK_TABLE (table_settings), 6);
- sw = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (sw),
- table_settings);
-
- accounts_widget_generic_setup (account, table_settings);
+ filename = empathy_file_lookup ("empathy-account-widget-generic.glade",
+ "libempathy-gtk");
+ glade = empathy_glade_get_file (filename,
+ "vbox_generic_settings",
+ NULL,
+ "vbox_generic_settings", &widget,
+ "table_common_settings", &table_common_settings,
+ "table_advanced_settings", &table_advanced_settings,
+ NULL);
+ g_free (filename);
+
+ accounts_widget_generic_setup (account, table_common_settings, table_advanced_settings);
- g_signal_connect (sw, "destroy",
- G_CALLBACK (account_widget_destroy_cb),
- g_object_ref (account));
+ g_object_unref (glade);
- gtk_widget_show_all (sw);
+ gtk_widget_show_all (widget);
- return sw;
+ return widget;
}
GtkWidget *
{
GladeXML *glade;
GtkWidget *widget;
-
- glade = empathy_glade_get ("empathy-account-widget-salut.glade",
- "vbox_salut_settings",
- NULL);
-
- widget = empathy_account_widget_new_with_glade (account, glade,
- "vbox_salut_settings",
+ gchar *filename;
+
+ filename = empathy_file_lookup ("empathy-account-widget-salut.glade",
+ "libempathy-gtk");
+ glade = empathy_glade_get_file (filename,
+ "vbox_salut_settings",
+ NULL,
+ "vbox_salut_settings", &widget,
+ NULL);
+ g_free (filename);
+
+ empathy_account_widget_handle_params (account, glade,
"entry_published", "published-name",
"entry_nickname", "nickname",
"entry_first_name", "first-name",
{
GladeXML *glade;
GtkWidget *widget;
-
- glade = empathy_glade_get ("empathy-account-widget-msn.glade",
- "vbox_msn_settings",
- NULL);
-
- widget = empathy_account_widget_new_with_glade (account, glade,
- "vbox_msn_settings",
+ gchar *filename;
+
+ filename = empathy_file_lookup ("empathy-account-widget-msn.glade",
+ "libempathy-gtk");
+ glade = empathy_glade_get_file (filename,
+ "vbox_msn_settings",
+ NULL,
+ "vbox_msn_settings", &widget,
+ NULL);
+ g_free (filename);
+
+ empathy_account_widget_handle_params (account, glade,
"entry_id", "account",
"entry_password", "password",
"entry_server", "server",
"spinbutton_port", "port",
NULL);
- emapthy_account_widget_add_forget_button (account, glade,
+ empathy_account_widget_add_forget_button (account, glade,
"button_forget",
"entry_password");
GtkWidget *widget;
GtkWidget *spinbutton_port;
GtkWidget *checkbutton_ssl;
+ gchar *filename;
- glade = empathy_glade_get_file ("empathy-account-widget-jabber.glade",
+ filename = empathy_file_lookup ("empathy-account-widget-jabber.glade",
+ "libempathy-gtk");
+ glade = empathy_glade_get_file (filename,
"vbox_jabber_settings",
NULL,
+ "vbox_jabber_settings", &widget,
"spinbutton_port", &spinbutton_port,
"checkbutton_ssl", &checkbutton_ssl,
NULL);
+ g_free (filename);
- widget = empathy_account_widget_new_with_glade (account, glade,
- "vbox_jabber_settings",
+ empathy_account_widget_handle_params (account, glade,
"entry_id", "account",
"entry_password", "password",
"entry_resource", "resource",
"checkbutton_encryption", "require-encryption",
NULL);
- emapthy_account_widget_add_forget_button (account, glade,
+ empathy_account_widget_add_forget_button (account, glade,
"button_forget",
"entry_password");
G_CALLBACK (account_widget_jabber_ssl_toggled_cb),
spinbutton_port);
- g_object_set_data_full (G_OBJECT (spinbutton_port), "account",
- g_object_ref (account),
- g_object_unref);
+ g_object_unref (glade);
+
+ gtk_widget_show (widget);
+
+ return widget;
+}
+
+GtkWidget *
+empathy_account_widget_icq_new (McAccount *account)
+{
+ GladeXML *glade;
+ GtkWidget *widget;
+ GtkWidget *spinbutton_port;
+ gchar *filename;
+
+ filename = empathy_file_lookup ("empathy-account-widget-icq.glade",
+ "libempathy-gtk");
+ glade = empathy_glade_get_file (filename,
+ "vbox_icq_settings",
+ NULL,
+ "vbox_icq_settings", &widget,
+ "spinbutton_port", &spinbutton_port,
+ NULL);
+ g_free (filename);
+
+ empathy_account_widget_handle_params (account, glade,
+ "entry_uin", "account",
+ "entry_password", "password",
+ "entry_server", "server",
+ "spinbutton_port", "port",
+ "entry_charset", "charset",
+ NULL);
+
+ empathy_account_widget_add_forget_button (account, glade,
+ "button_forget",
+ "entry_password");
+
+ g_object_unref (glade);
+
+ gtk_widget_show (widget);
+
+ return widget;
+}
+
+GtkWidget *
+empathy_account_widget_aim_new (McAccount *account)
+{
+ GladeXML *glade;
+ GtkWidget *widget;
+ GtkWidget *spinbutton_port;
+ gchar *filename;
+
+ filename = empathy_file_lookup ("empathy-account-widget-aim.glade",
+ "libempathy-gtk");
+ glade = empathy_glade_get_file (filename,
+ "vbox_aim_settings",
+ NULL,
+ "vbox_aim_settings", &widget,
+ "spinbutton_port", &spinbutton_port,
+ NULL);
+ g_free (filename);
+
+ empathy_account_widget_handle_params (account, glade,
+ "entry_screenname", "account",
+ "entry_password", "password",
+ "entry_server", "server",
+ "spinbutton_port", "port",
+ NULL);
+
+ empathy_account_widget_add_forget_button (account, glade,
+ "button_forget",
+ "entry_password");
+
+ g_object_unref (glade);
+
+ gtk_widget_show (widget);
+
+ return widget;
+}
+
+GtkWidget *
+empathy_account_widget_yahoo_new (McAccount *account)
+{
+ GladeXML *glade;
+ GtkWidget *widget;
+ gchar *filename;
+
+ filename = empathy_file_lookup ("empathy-account-widget-yahoo.glade",
+ "libempathy-gtk");
+ glade = empathy_glade_get_file (filename,
+ "vbox_yahoo_settings",
+ NULL,
+ "vbox_yahoo_settings", &widget,
+ NULL);
+ g_free (filename);
+
+ empathy_account_widget_handle_params (account, glade,
+ "entry_id", "account",
+ "entry_password", "password",
+ "entry_server", "server",
+ "entry_locale", "room-list-locale",
+ "entry_charset", "charset",
+ "spinbutton_port", "port",
+ "checkbutton_yahoojp", "yahoojp",
+ "checkbutton_ignore_invites", "ignore-invites",
+ NULL);
+
+ empathy_account_widget_add_forget_button (account, glade,
+ "button_forget",
+ "entry_password");
+
+ g_object_unref (glade);
+
+ gtk_widget_show (widget);
+
+ return widget;
+}
+
+GtkWidget *
+empathy_account_widget_groupwise_new (McAccount *account)
+{
+ GladeXML *glade;
+ GtkWidget *widget;
+ gchar *filename;
+
+ filename = empathy_file_lookup ("empathy-account-widget-groupwise.glade",
+ "libempathy-gtk");
+ glade = empathy_glade_get_file (filename,
+ "vbox_groupwise_settings",
+ NULL,
+ "vbox_groupwise_settings", &widget,
+ NULL);
+ g_free (filename);
+
+ empathy_account_widget_handle_params (account, glade,
+ "entry_id", "account",
+ "entry_password", "password",
+ "entry_server", "server",
+ "spinbutton_port", "port",
+ NULL);
+
+ empathy_account_widget_add_forget_button (account, glade,
+ "button_forget",
+ "entry_password");
g_object_unref (glade);
projects / empathy.git / blobdiff