* Danielle Madeley <danielle.madeley@collabora.co.uk>
*/
-#include <config.h>
-
-#include <string.h>
+#include "config.h"
+#include "empathy-account-widget.h"
+#include "empathy-account-widget-private.h"
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
-
-#include <gio/gdesktopappinfo.h>
-
-#include <libempathy/empathy-utils.h>
-
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/connection-manager.h>
-#include <telepathy-glib/util.h>
#include <dbus/dbus-protocol.h>
-#include "empathy-account-widget.h"
+#include "empathy-account-widget-irc.h"
#include "empathy-account-widget-private.h"
#include "empathy-account-widget-sip.h"
-#include "empathy-account-widget-irc.h"
#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyAccountWidget, empathy_account_widget, GTK_TYPE_BOX)
LAST_SIGNAL
};
-static void account_widget_apply_and_log_in (EmpathyAccountWidget *);
-
enum {
RESPONSE_LAUNCH
};
/* Based on http://www.ietf.org/rfc/rfc2812.txt (section 2.3.1) */
#define IRC_SPECIAL "_\\[\\]{}\\\\|`^"
#define IRC_NICK_NAME "(["ALPHA IRC_SPECIAL"]["ALPHADIGITDASH IRC_SPECIAL"]*)"
-/* user = 1*( %x01-09 / %x0B-0C / %x0E-1F / %x21-3F / %x41-FF )
- * ; any octet except NUL, CR, LF, " " and "@"
- *
- * so technically, like so many other places in IRC, we should be using arrays
- * of bytes here rather than UTF-8 strings. Life: too short. In practice this
- * will always be ASCII.
- */
-#define IRC_USER_NAME "([^\r\n@ ])+"
/* Based on http://www.ietf.org/rfc/rfc4622.txt (section 2.2)
* We just exclude invalid characters to avoid ucschars and other redundant
#define ACCOUNT_REGEX_ICQ "^"ICQ_USER_NAME"$"
#define ACCOUNT_REGEX_IRC "^"IRC_NICK_NAME"$"
-#define USERNAME_REGEX_IRC "^"IRC_USER_NAME"$"
#define ACCOUNT_REGEX_JABBER "^"JABBER_USER_NAME"@[^@/]+"
#define ACCOUNT_REGEX_MSN "^"MSN_USER_NAME"@"HOST"$"
#define ACCOUNT_REGEX_YAHOO "^"YAHOO_USER_NAME"$"
if (EMP_STR_EMPTY (str))
{
- const gchar *value = NULL;
-
empathy_account_settings_unset (self->priv->settings, param_name);
if (focus)
{
- value = empathy_account_settings_get_string (self->priv->settings,
+ gchar *value;
+
+ value = empathy_account_settings_dup_string (self->priv->settings,
param_name);
+
DEBUG ("Unset %s and restore to %s", param_name, value);
gtk_entry_set_text (entry, value ? value : "");
+ g_free (value);
}
}
else
GtkTreeIter iter;
GtkTreeModel *model;
const gchar *value;
- const GValue *v;
+ GVariant *v;
const gchar *default_value = NULL;
const gchar *param_name;
param_name = g_object_get_data (G_OBJECT (widget), "param_name");
- v = empathy_account_settings_get_default (self->priv->settings, param_name);
- if (v != NULL)
- default_value = g_value_get_string (v);
+ v = empathy_account_settings_dup_default (self->priv->settings, param_name);
+ if (v != NULL && g_variant_is_of_type (v, G_VARIANT_TYPE_STRING))
+ default_value = g_variant_get_string (v, NULL);
if (!tp_strdiff (value, default_value))
{
}
empathy_account_widget_changed (self);
+
+ tp_clear_pointer (&v, g_variant_unref);
}
static void
EmpathyAccountWidget *self)
{
if (gtk_widget_get_sensitive (self->priv->apply_button))
- account_widget_apply_and_log_in (self);
+ empathy_account_widget_apply_and_log_in (self);
}
static void
EmpathyAccountWidget *self)
{
if (gtk_widget_get_sensitive (self->priv->apply_button))
- account_widget_apply_and_log_in (self);
+ empathy_account_widget_apply_and_log_in (self);
}
void
}
else if (GTK_IS_ENTRY (widget))
{
- const gchar *str = NULL;
+ gchar *str;
- str = empathy_account_settings_get_string (self->priv->settings,
+ str = empathy_account_settings_dup_string (self->priv->settings,
param_name);
gtk_entry_set_text (GTK_ENTRY (widget), str ? str : "");
g_signal_connect (widget, "activate",
G_CALLBACK (account_entry_activated_cb), self);
-
g_signal_connect (widget, "changed",
G_CALLBACK (account_widget_entry_changed_cb), self);
g_signal_connect (widget, "map",
G_CALLBACK (account_widget_entry_map_cb), self);
+
+ g_free (str);
}
else if (GTK_IS_TOGGLE_BUTTON (widget))
{
{
/* The combo box's model has to contain the param value in its first
* column (as a string) */
- const gchar *str;
+ gchar *str;
GtkTreeModel *model;
GtkTreeIter iter;
gboolean valid;
- str = empathy_account_settings_get_string (self->priv->settings,
+ str = empathy_account_settings_dup_string (self->priv->settings,
param_name);
model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget));
g_free (name);
}
+ g_free (str);
+
g_signal_connect (widget, "changed",
G_CALLBACK (account_widget_combobox_changed_cb),
self);
g_object_unref (self);
}
-static void
-account_widget_apply_and_log_in (EmpathyAccountWidget *self)
+void
+empathy_account_widget_apply_and_log_in (EmpathyAccountWidget *self)
{
gboolean display_name_overridden;
account_widget_apply_clicked_cb (GtkWidget *button,
EmpathyAccountWidget *self)
{
- account_widget_apply_and_log_in (self);
+ empathy_account_widget_apply_and_log_in (self);
}
static void
{
GtkWidget *expander_advanced, *box;
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_generic_settings", &box,
"expander_advanced_settings", &expander_advanced,
{
GtkWidget *expander_advanced, *box;
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_salut_settings", &box,
"expander_advanced_settings", &expander_advanced,
empathy_account_settings_set_regex (self->priv->settings, "account",
ACCOUNT_REGEX_IRC);
- empathy_account_settings_set_regex (self->priv->settings, "username",
- USERNAME_REGEX_IRC);
if (self->priv->simple)
{
if (self->priv->simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_msn_simple", &box,
NULL);
}
else
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_msn_settings", &self->priv->grid_common_settings,
"vbox_msn_settings", &box,
NULL);
suffix_id_widget_changed_cb (GtkWidget *entry,
EmpathyAccountWidget *self)
{
- const gchar *account;
+ gchar *account;
g_assert (self->priv->jid_suffix != NULL);
account_widget_entry_changed_common (self, GTK_ENTRY (entry), FALSE);
- account = empathy_account_settings_get_string (self->priv->settings,
+ account = empathy_account_settings_dup_string (self->priv->settings,
"account");
+
if (!EMP_STR_EMPTY (account) &&
!g_str_has_suffix (account, self->priv->jid_suffix))
{
}
empathy_account_widget_changed (self);
+
+ g_free (account);
}
static gchar *
GtkWidget *widget,
const gchar *suffix)
{
- const gchar *str = NULL;
+ gchar *str = NULL;
g_object_set_data_full (G_OBJECT (widget), "param_name",
g_strdup ("account"), g_free);
g_assert (self->priv->jid_suffix == NULL);
self->priv->jid_suffix = g_strdup (suffix);
- str = empathy_account_settings_get_string (self->priv->settings, "account");
+ str = empathy_account_settings_dup_string (self->priv->settings, "account");
if (str != NULL)
{
gchar *tmp;
tmp = remove_jid_suffix (self, str);
gtk_entry_set_text (GTK_ENTRY (widget), tmp);
g_free (tmp);
+ g_free (str);
}
self->priv->param_account_widget = widget;
if (self->priv->simple && service == NO_SERVICE)
{
/* Simple widget for XMPP */
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_jabber_simple", &box,
"label_id_simple", &label_id,
"label_id_create", &label_id_create,
else if (self->priv->simple && service == GTALK_SERVICE)
{
/* Simple widget for Google Talk */
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_gtalk_simple", &box,
NULL);
else if (self->priv->simple && service == FACEBOOK_SERVICE)
{
/* Simple widget for Facebook */
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_fb_simple", &box,
"entry_id_fb_simple", &entry_id,
NULL);
ServiceInfo info = services_infos[service];
/* Full widget for XMPP, Google Talk and Facebook*/
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_jabber_settings", &box,
"spinbutton_port", &spinbutton_port,
if (self->priv->simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_icq_simple", &box,
NULL);
}
else
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_icq_settings", &box,
"spinbutton_port", &spinbutton_port,
if (self->priv->simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_aim_simple", &box,
NULL);
}
else
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_aim_settings", &box,
"spinbutton_port", &spinbutton_port,
if (self->priv->simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_yahoo_simple", &box,
NULL);
}
else
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_settings", &self->priv->grid_common_settings,
"vbox_yahoo_settings", &box,
NULL);
if (self->priv->simple)
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"vbox_groupwise_simple", &box,
NULL);
}
else
{
- self->ui_details->gui = empathy_builder_get_file (filename,
+ self->ui_details->gui = empathy_builder_get_resource (filename,
"grid_common_groupwise_settings", &self->priv->grid_common_settings,
"vbox_groupwise_settings", &box,
NULL);
}
#define WIDGET(cm, proto) \
- { #cm, #proto, "empathy-account-widget-"#proto".ui", \
+ { #cm, #proto, ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-"#proto".ui", \
account_widget_build_##proto }
static void
remember_password_toggled_cb (GtkToggleButton *button,
EmpathyAccountWidget *self)
{
- if (gtk_toggle_button_get_active (button))
- {
- gtk_widget_set_sensitive (self->priv->param_password_widget, TRUE);
- }
- else
- {
- gtk_widget_set_sensitive (self->priv->param_password_widget, FALSE);
- gtk_entry_set_text (GTK_ENTRY (self->priv->param_password_widget), "");
- empathy_account_settings_unset (self->priv->settings, "password");
- }
+ empathy_account_settings_set_remember_password (self->priv->settings,
+ gtk_toggle_button_get_active (button));
+
+ if (!self->priv->automatic_change)
+ empathy_account_widget_changed (self);
}
static void
gpointer user_data)
{
EmpathyAccountWidget *self = user_data;
- const gchar *password = empathy_account_settings_get_string (
+ gchar *password;
+
+ password = empathy_account_settings_dup_string (
self->priv->settings, "password");
+ /* We have to do this so that when we call gtk_entry_set_text,
+ * the ::changed callback doesn't think the user made the
+ * change. This is also used in remember_password_toggled_cb. */
+ self->priv->automatic_change = TRUE;
+
if (password != NULL)
{
- /* We have to do this so that when we call gtk_entry_set_text,
- * the ::changed callback doesn't think the user made the
- * change. */
- self->priv->automatic_change = TRUE;
gtk_entry_set_text (GTK_ENTRY (self->priv->param_password_widget),
password);
- self->priv->automatic_change = FALSE;
}
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (self->priv->remember_password_widget),
!EMP_STR_EMPTY (password));
+
+ self->priv->automatic_change = FALSE;
+
+ g_free (password);
}
static void
const char *file;
GtkWidget * (*func)(EmpathyAccountWidget *self, const gchar *filename);
} widgets [] = {
- { "salut", "local-xmpp", "empathy-account-widget-local-xmpp.ui",
+ { "salut", "local-xmpp", ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-local-xmpp.ui",
account_widget_build_salut },
WIDGET (gabble, jabber),
WIDGET (haze, msn),
if (!tp_strdiff (widgets[i].cm_name, cm_name) &&
!tp_strdiff (widgets[i].protocol, protocol))
{
- gchar *filename;
-
- filename = empathy_file_lookup (widgets[i].file,
- "libempathy-gtk");
- box = widgets[i].func (self, filename);
- g_free (filename);
-
+ box = widgets[i].func (self, widgets[i].file);
break;
}
}
if (i == G_N_ELEMENTS (widgets))
{
- gchar *filename = empathy_file_lookup (
- "empathy-account-widget-generic.ui", "libempathy-gtk");
+ gchar *filename = ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-generic.ui";
box = account_widget_build_generic (self, filename);
- g_free (filename);
}
gtk_container_add (GTK_CONTAINER (self), box);
}
else
{
+ gchar *password;
+
+ password = empathy_account_settings_dup_string (self->priv->settings,
+ "password");
+
+ /* FIXME: we should enable this checkbox only if the password is
+ * stored for good in the password storage, not only for the session
+ * (bgo #683571) */
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (self->priv->remember_password_widget),
- !EMP_STR_EMPTY (empathy_account_settings_get_string (
- self->priv->settings, "password")));
+ !EMP_STR_EMPTY (password));
/* The password might not have been retrieved from the
* keyring yet. We should update the remember password
tp_g_signal_connect_object (self->priv->settings,
"password-retrieved",
G_CALLBACK (account_settings_password_retrieved_cb), self, 0);
+
+ g_free (password);
}
g_signal_connect (self->priv->remember_password_widget, "toggled",
G_CALLBACK (remember_password_toggled_cb), self);
+ self->priv->automatic_change = TRUE;
remember_password_toggled_cb (
GTK_TOGGLE_BUTTON (self->priv->remember_password_widget), self);
+ self->priv->automatic_change = FALSE;
}
else if (self->priv->remember_password_widget != NULL
&& !empathy_account_settings_supports_sasl (self->priv->settings))
{
gtk_widget_set_visible (self->priv->remember_password_widget, FALSE);
+ empathy_account_settings_set_remember_password (self->priv->settings,
+ TRUE);
}
/* dup and init the account-manager */
gchar *
empathy_account_widget_get_default_display_name (EmpathyAccountWidget *self)
{
- const gchar *login_id;
+ gchar *login_id;
const gchar *protocol, *p;
gchar *default_display_name;
Service service;
- login_id = empathy_account_settings_get_string (self->priv->settings,
+ login_id = empathy_account_settings_dup_string (self->priv->settings,
"account");
protocol = empathy_account_settings_get_protocol (self->priv->settings);
service = account_widget_get_service (self);
default_display_name = g_strdup (_("New account"));
}
+ g_free (login_id);
+
return default_display_name;
}
projects / empathy.git / blobdiff