X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2Fempathy-preferences.c;h=6901aa9c8b88e366ed27b78d925306df0a6dbec8;hp=4460d6f857029f10f3aba78f1a0a4762cce5eb37;hb=f2d81bc778ae11d5518d9b054ce230fc90d37c82;hpb=e0dfeacc5638249a9b3864e04195353ea4271806 diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index 4460d6f8..6901aa9c 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -20,70 +20,67 @@ * Authors: Mikael Hallendal * Richard Hult * Martyn Russell + * Danielle Madeley */ -#include - -#include +#include "config.h" +#include "empathy-preferences.h" -#include #include -#include -#include -#include -#include +#include "empathy-client-factory.h" +#include "empathy-gsettings.h" +#include "empathy-spell.h" +#include "empathy-theme-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" -#include -#include -#include -#include -#include +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER +#include "empathy-debug.h" -#ifdef HAVE_WEBKIT -#include -#endif +G_DEFINE_TYPE (EmpathyPreferences, empathy_preferences, GTK_TYPE_DIALOG); -#include "empathy-preferences.h" +#define GET_PRIV(self) ((EmpathyPreferencesPriv *)((EmpathyPreferences *) self)->priv) -typedef struct { - GtkWidget *dialog; +static const gchar * empathy_preferences_tabs[] = +{ + "general", + "notifications", + "sounds", + "calls", + "location", + "spell", + "themes", +}; +struct _EmpathyPreferencesPriv { GtkWidget *notebook; - GtkWidget *checkbutton_show_smileys; - GtkWidget *checkbutton_show_contacts_in_rooms; - GtkWidget *combobox_chat_theme; - GtkWidget *checkbutton_separate_chat_windows; - GtkWidget *checkbutton_autoconnect; + GtkWidget *checkbutton_events_notif_area; - GtkWidget *checkbutton_sounds_enabled; - GtkWidget *checkbutton_sounds_disabled_away; GtkWidget *treeview_sounds; - - GtkWidget *checkbutton_notifications_enabled; - GtkWidget *checkbutton_notifications_disabled_away; - GtkWidget *checkbutton_notifications_focus; - GtkWidget *checkbutton_notifications_contact_signin; - GtkWidget *checkbutton_notifications_contact_signout; - GtkWidget *treeview_spell_checker; - GtkWidget *checkbutton_location_publish; - GtkWidget *checkbutton_location_reduce_accuracy; - GtkWidget *checkbutton_location_resource_network; - GtkWidget *checkbutton_location_resource_cell; - GtkWidget *checkbutton_location_resource_gps; + GtkWidget *vbox_chat_theme; + GtkWidget *combobox_chat_theme; + GtkWidget *combobox_chat_theme_variant; + GtkWidget *hbox_chat_theme_variant; + GtkWidget *sw_chat_theme_preview; + EmpathyThemeAdium *chat_theme_preview; + EmpathyThemeManager *theme_manager; GSettings *gsettings; GSettings *gsettings_chat; + GSettings *gsettings_call; GSettings *gsettings_loc; GSettings *gsettings_notify; GSettings *gsettings_sound; GSettings *gsettings_ui; -} EmpathyPreferences; + GSettings *gsettings_logger; +}; -static void preferences_setup_widgets (EmpathyPreferences *preferences); +static void preferences_setup_widgets (EmpathyPreferences *preferences, + GtkBuilder *gui); static void preferences_languages_setup (EmpathyPreferences *preferences); static void preferences_languages_add (EmpathyPreferences *preferences); static void preferences_languages_save (EmpathyPreferences *preferences); @@ -95,15 +92,10 @@ static void preferences_languages_load (EmpathyPreferences static gboolean preferences_languages_load_foreach (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, - gchar **languages); + GList *languages); static void preferences_languages_cell_toggled_cb (GtkCellRendererToggle *cell, gchar *path_string, EmpathyPreferences *preferences); -static void preferences_destroy_cb (GtkWidget *widget, - EmpathyPreferences *preferences); -static void preferences_response_cb (GtkWidget *widget, - gint response, - EmpathyPreferences *preferences); enum { COL_LANG_ENABLED, @@ -113,11 +105,16 @@ enum { }; enum { - COL_COMBO_IS_ADIUM, - COL_COMBO_VISIBLE_NAME, - COL_COMBO_NAME, - COL_COMBO_PATH, - COL_COMBO_COUNT + COL_THEME_VISIBLE_NAME, + COL_THEME_ADIUM_NAME, + COL_THEME_ADIUM_INFO, + COL_THEME_COUNT +}; + +enum { + COL_VARIANT_NAME, + COL_VARIANT_DEFAULT, + COL_VARIANT_COUNT }; enum { @@ -137,156 +134,110 @@ static SoundEventEntry sound_entries [] = { { N_("Message received"), EMPATHY_PREFS_SOUNDS_INCOMING_MESSAGE }, { N_("Message sent"), EMPATHY_PREFS_SOUNDS_OUTGOING_MESSAGE }, { N_("New conversation"), EMPATHY_PREFS_SOUNDS_NEW_CONVERSATION }, - { N_("Contact goes online"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN }, + { N_("Contact comes online"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGIN }, { N_("Contact goes offline"), EMPATHY_PREFS_SOUNDS_CONTACT_LOGOUT }, { N_("Account connected"), EMPATHY_PREFS_SOUNDS_SERVICE_LOGIN }, { N_("Account disconnected"), EMPATHY_PREFS_SOUNDS_SERVICE_LOGOUT } }; static void -preferences_setup_widgets (EmpathyPreferences *preferences) +preferences_setup_widgets (EmpathyPreferences *preferences, + GtkBuilder *gui) { - g_settings_bind (preferences->gsettings_notify, - EMPATHY_PREFS_NOTIFICATIONS_ENABLED, - preferences->checkbutton_notifications_enabled, - "active", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (preferences->gsettings_notify, - EMPATHY_PREFS_NOTIFICATIONS_DISABLED_AWAY, - preferences->checkbutton_notifications_disabled_away, - "active", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (preferences->gsettings_notify, - EMPATHY_PREFS_NOTIFICATIONS_FOCUS, - preferences->checkbutton_notifications_focus, - "active", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (preferences->gsettings_notify, - EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNIN, - preferences->checkbutton_notifications_contact_signin, - "active", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (preferences->gsettings_notify, - EMPATHY_PREFS_NOTIFICATIONS_CONTACT_SIGNOUT, - preferences->checkbutton_notifications_contact_signout, - "active", + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); +#define BIND_ACTIVE(schema, key, widget) \ + g_settings_bind (priv->gsettings_##schema, EMPATHY_PREFS_##key, \ + gtk_builder_get_object (gui, widget), "active", \ G_SETTINGS_BIND_DEFAULT); - g_settings_bind (preferences->gsettings_notify, - EMPATHY_PREFS_NOTIFICATIONS_ENABLED, - preferences->checkbutton_notifications_disabled_away, - "sensitive", - G_SETTINGS_BIND_GET); - g_settings_bind (preferences->gsettings_notify, - EMPATHY_PREFS_NOTIFICATIONS_ENABLED, - preferences->checkbutton_notifications_focus, - "sensitive", - G_SETTINGS_BIND_GET); - g_settings_bind (preferences->gsettings_notify, - EMPATHY_PREFS_NOTIFICATIONS_ENABLED, - preferences->checkbutton_notifications_contact_signin, - "sensitive", - G_SETTINGS_BIND_GET); - g_settings_bind (preferences->gsettings_notify, - EMPATHY_PREFS_NOTIFICATIONS_ENABLED, - preferences->checkbutton_notifications_contact_signout, - "sensitive", - G_SETTINGS_BIND_GET); - - g_settings_bind (preferences->gsettings_sound, - EMPATHY_PREFS_SOUNDS_ENABLED, - preferences->checkbutton_sounds_enabled, - "active", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (preferences->gsettings_sound, - EMPATHY_PREFS_SOUNDS_DISABLED_AWAY, - preferences->checkbutton_sounds_disabled_away, - "active", - G_SETTINGS_BIND_DEFAULT); - - g_settings_bind (preferences->gsettings_sound, - EMPATHY_PREFS_SOUNDS_ENABLED, - preferences->checkbutton_sounds_disabled_away, - "sensitive", - G_SETTINGS_BIND_GET); - g_settings_bind (preferences->gsettings_sound, - EMPATHY_PREFS_SOUNDS_ENABLED, - preferences->treeview_sounds, - "sensitive", + BIND_ACTIVE (notify, NOTIFICATIONS_ENABLED, + "checkbutton_notifications_enabled"); + BIND_ACTIVE (notify, NOTIFICATIONS_DISABLED_AWAY, + "checkbutton_notifications_disabled_away"); + BIND_ACTIVE (notify, NOTIFICATIONS_FOCUS, + "checkbutton_notifications_focus"); + BIND_ACTIVE (notify, NOTIFICATIONS_CONTACT_SIGNIN, + "checkbutton_notifications_contact_signin"); + BIND_ACTIVE (notify, NOTIFICATIONS_CONTACT_SIGNOUT, + "checkbutton_notifications_contact_signout"); + + BIND_ACTIVE (sound, SOUNDS_ENABLED, + "checkbutton_sounds_enabled"); + BIND_ACTIVE (sound, SOUNDS_DISABLED_AWAY, + "checkbutton_sounds_disabled_away"); + + BIND_ACTIVE (ui, UI_SHOW_OFFLINE, + "checkbutton_show_offline"); + BIND_ACTIVE (ui, UI_SHOW_GROUPS, + "checkbutton_show_groups"); + BIND_ACTIVE (ui, UI_SEPARATE_CHAT_WINDOWS, + "radiobutton_chats_new_windows"); + BIND_ACTIVE (ui, UI_EVENTS_NOTIFY_AREA, + "checkbutton_events_notif_area"); + BIND_ACTIVE (ui, UI_SHOW_BALANCES, + "checkbutton_show_balances"); + + BIND_ACTIVE (chat, CHAT_SHOW_SMILEYS, + "checkbutton_show_smileys"); + BIND_ACTIVE (chat, CHAT_SHOW_CONTACTS_IN_ROOMS, + "checkbutton_show_contacts_in_rooms"); + + BIND_ACTIVE (call, CALL_ECHO_CANCELLATION, + "call_echo_cancellation"); + + BIND_ACTIVE (loc, LOCATION_PUBLISH, + "checkbutton_location_publish"); + BIND_ACTIVE (loc, LOCATION_RESOURCE_NETWORK, + "checkbutton_location_resource_network"); + BIND_ACTIVE (loc, LOCATION_RESOURCE_CELL, + "checkbutton_location_resource_cell"); + BIND_ACTIVE (loc, LOCATION_RESOURCE_GPS, + "checkbutton_location_resource_gps"); + BIND_ACTIVE (loc, LOCATION_REDUCE_ACCURACY, + "checkbutton_location_reduce_accuracy"); + + BIND_ACTIVE (logger, LOGGER_ENABLED, + "checkbutton_logging"); + +#undef BIND_ACTIVE + +#define BIND_SENSITIVE(schema, key, widget) \ + g_settings_bind (priv->gsettings_##schema, EMPATHY_PREFS_##key, \ + gtk_builder_get_object (gui, widget), "sensitive", \ G_SETTINGS_BIND_GET); - - g_settings_bind (preferences->gsettings_ui, - EMPATHY_PREFS_UI_SEPARATE_CHAT_WINDOWS, - preferences->checkbutton_separate_chat_windows, - "active", - G_SETTINGS_BIND_DEFAULT); - - g_settings_bind (preferences->gsettings_chat, - EMPATHY_PREFS_CHAT_SHOW_SMILEYS, - preferences->checkbutton_show_smileys, - "active", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (preferences->gsettings_chat, - EMPATHY_PREFS_CHAT_SHOW_CONTACTS_IN_ROOMS, - preferences->checkbutton_show_contacts_in_rooms, - "active", - G_SETTINGS_BIND_DEFAULT); - - g_settings_bind (preferences->gsettings, + /* N.B. BIND_SENSITIVE() is in addition to the sensitivity setting of + * BIND_ACTIVE() */ + BIND_SENSITIVE (notify, NOTIFICATIONS_ENABLED, + "checkbutton_notifications_disabled_away"); + BIND_SENSITIVE (notify, NOTIFICATIONS_ENABLED, + "checkbutton_notifications_focus"); + BIND_SENSITIVE (notify, NOTIFICATIONS_ENABLED, + "checkbutton_notifications_contact_signin"); + BIND_SENSITIVE (notify, NOTIFICATIONS_ENABLED, + "checkbutton_notifications_contact_signout"); + + BIND_SENSITIVE (sound, SOUNDS_ENABLED, + "checkbutton_sounds_disabled_away"); + BIND_SENSITIVE (sound, SOUNDS_ENABLED, + "treeview_sounds"); + + BIND_SENSITIVE (loc, LOCATION_PUBLISH, + "checkbutton_location_resource_network"); + BIND_SENSITIVE (loc, LOCATION_PUBLISH, + "checkbutton_location_resource_cell"); + BIND_SENSITIVE (loc, LOCATION_PUBLISH, + "checkbutton_location_resource_gps"); + BIND_SENSITIVE (loc, LOCATION_PUBLISH, + "checkbutton_location_reduce_accuracy"); + +#undef BIND_SENSITIVE + + g_settings_bind (priv->gsettings, EMPATHY_PREFS_AUTOCONNECT, - preferences->checkbutton_autoconnect, - "active", - G_SETTINGS_BIND_DEFAULT); - - g_settings_bind (preferences->gsettings_loc, - EMPATHY_PREFS_LOCATION_PUBLISH, - preferences->checkbutton_location_publish, - "active", - G_SETTINGS_BIND_DEFAULT); - - g_settings_bind (preferences->gsettings_loc, - EMPATHY_PREFS_LOCATION_RESOURCE_NETWORK, - preferences->checkbutton_location_resource_network, - "active", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (preferences->gsettings_loc, - EMPATHY_PREFS_LOCATION_PUBLISH, - preferences->checkbutton_location_resource_network, - "sensitive", - G_SETTINGS_BIND_GET); - - g_settings_bind (preferences->gsettings_loc, - EMPATHY_PREFS_LOCATION_RESOURCE_CELL, - preferences->checkbutton_location_resource_cell, - "active", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (preferences->gsettings_loc, - EMPATHY_PREFS_LOCATION_PUBLISH, - preferences->checkbutton_location_resource_cell, - "sensitive", - G_SETTINGS_BIND_GET); - - g_settings_bind (preferences->gsettings_loc, - EMPATHY_PREFS_LOCATION_RESOURCE_GPS, - preferences->checkbutton_location_resource_gps, - "active", - G_SETTINGS_BIND_DEFAULT); - g_settings_bind (preferences->gsettings_loc, - EMPATHY_PREFS_LOCATION_PUBLISH, - preferences->checkbutton_location_resource_gps, - "sensitive", - G_SETTINGS_BIND_GET); - - g_settings_bind (preferences->gsettings_loc, - EMPATHY_PREFS_LOCATION_REDUCE_ACCURACY, - preferences->checkbutton_location_reduce_accuracy, + gtk_builder_get_object (gui, + "checkbutton_autoconnect"), "active", G_SETTINGS_BIND_DEFAULT); - g_settings_bind (preferences->gsettings_loc, - EMPATHY_PREFS_LOCATION_PUBLISH, - preferences->checkbutton_location_reduce_accuracy, - "sensitive", - G_SETTINGS_BIND_GET); } static void @@ -294,18 +245,18 @@ preferences_sound_cell_toggled_cb (GtkCellRendererToggle *toggle, char *path_string, EmpathyPreferences *preferences) { + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); GtkTreePath *path; - gboolean toggled, instore; + gboolean instore; GtkTreeIter iter; GtkTreeView *view; GtkTreeModel *model; char *key; - view = GTK_TREE_VIEW (preferences->treeview_sounds); + view = GTK_TREE_VIEW (priv->treeview_sounds); model = gtk_tree_view_get_model (view); path = gtk_tree_path_new_from_string (path_string); - toggled = gtk_cell_renderer_toggle_get_active (toggle); gtk_tree_model_get_iter (model, &iter, path); gtk_tree_model_get (model, &iter, COL_SOUND_KEY, &key, @@ -316,7 +267,7 @@ preferences_sound_cell_toggled_cb (GtkCellRendererToggle *toggle, gtk_list_store_set (GTK_LIST_STORE (model), &iter, COL_SOUND_ENABLED, instore, -1); - g_settings_set_boolean (preferences->gsettings_sound, key, instore); + g_settings_set_boolean (priv->gsettings_sound, key, instore); g_free (key); gtk_tree_path_free (path); @@ -325,17 +276,18 @@ preferences_sound_cell_toggled_cb (GtkCellRendererToggle *toggle, static void preferences_sound_load (EmpathyPreferences *preferences) { + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); guint i; GtkTreeView *view; GtkListStore *store; GtkTreeIter iter; gboolean set; - view = GTK_TREE_VIEW (preferences->treeview_sounds); + view = GTK_TREE_VIEW (priv->treeview_sounds); store = GTK_LIST_STORE (gtk_tree_view_get_model (view)); for (i = 0; i < G_N_ELEMENTS (sound_entries); i++) { - set = g_settings_get_boolean (preferences->gsettings_sound, + set = g_settings_get_boolean (priv->gsettings_sound, sound_entries[i].key); gtk_list_store_insert_with_values (store, &iter, i, @@ -348,12 +300,13 @@ preferences_sound_load (EmpathyPreferences *preferences) static void preferences_sound_setup (EmpathyPreferences *preferences) { + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); GtkTreeView *view; GtkListStore *store; GtkCellRenderer *renderer; GtkTreeViewColumn *column; - view = GTK_TREE_VIEW (preferences->treeview_sounds); + view = GTK_TREE_VIEW (priv->treeview_sounds); store = gtk_list_store_new (COL_SOUND_COUNT, G_TYPE_BOOLEAN, /* enabled */ @@ -388,15 +341,15 @@ preferences_sound_setup (EmpathyPreferences *preferences) static void preferences_languages_setup (EmpathyPreferences *preferences) { + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); GtkTreeView *view; GtkListStore *store; GtkTreeSelection *selection; - GtkTreeModel *model; GtkTreeViewColumn *column; GtkCellRenderer *renderer; guint col_offset; - view = GTK_TREE_VIEW (preferences->treeview_spell_checker); + view = GTK_TREE_VIEW (priv->treeview_spell_checker); store = gtk_list_store_new (COL_LANG_COUNT, G_TYPE_BOOLEAN, /* enabled */ @@ -408,8 +361,6 @@ preferences_languages_setup (EmpathyPreferences *preferences) selection = gtk_tree_view_get_selection (view); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); - model = GTK_TREE_MODEL (store); - renderer = gtk_cell_renderer_toggle_new (); g_signal_connect (renderer, "toggled", G_CALLBACK (preferences_languages_cell_toggled_cb), @@ -442,24 +393,21 @@ preferences_languages_setup (EmpathyPreferences *preferences) static void preferences_languages_add (EmpathyPreferences *preferences) { + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); GtkTreeView *view; GtkListStore *store; GList *codes, *l; - view = GTK_TREE_VIEW (preferences->treeview_spell_checker); + view = GTK_TREE_VIEW (priv->treeview_spell_checker); store = GTK_LIST_STORE (gtk_tree_view_get_model (view)); codes = empathy_spell_get_language_codes (); - g_settings_set_boolean (preferences->gsettings_chat, - EMPATHY_PREFS_CHAT_SPELL_CHECKER_ENABLED, - codes != NULL); if (!codes) { - gtk_widget_set_sensitive (preferences->treeview_spell_checker, FALSE); + gtk_widget_set_sensitive (priv->treeview_spell_checker, FALSE); } for (l = codes; l; l = l->next) { - GtkTreeIter iter; const gchar *code; const gchar *name; @@ -469,8 +417,7 @@ preferences_languages_add (EmpathyPreferences *preferences) continue; } - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, + gtk_list_store_insert_with_values (store, NULL, -1, COL_LANG_CODE, code, COL_LANG_NAME, name, -1); @@ -482,12 +429,13 @@ preferences_languages_add (EmpathyPreferences *preferences) static void preferences_languages_save (EmpathyPreferences *preferences) { + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); GtkTreeView *view; GtkTreeModel *model; gchar *languages = NULL; - view = GTK_TREE_VIEW (preferences->treeview_spell_checker); + view = GTK_TREE_VIEW (priv->treeview_spell_checker); model = gtk_tree_view_get_model (view); gtk_tree_model_foreach (model, @@ -495,11 +443,11 @@ preferences_languages_save (EmpathyPreferences *preferences) &languages); /* if user selects no languages, we don't want spell check */ - g_settings_set_boolean (preferences->gsettings_chat, + g_settings_set_boolean (priv->gsettings_chat, EMPATHY_PREFS_CHAT_SPELL_CHECKER_ENABLED, languages != NULL); - g_settings_set_string (preferences->gsettings_chat, + g_settings_set_string (priv->gsettings_chat, EMPATHY_PREFS_CHAT_SPELL_CHECKER_LANGUAGES, languages != NULL ? languages : ""); @@ -545,39 +493,37 @@ preferences_languages_save_foreach (GtkTreeModel *model, static void preferences_languages_load (EmpathyPreferences *preferences) { + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); GtkTreeView *view; GtkTreeModel *model; - gchar *value; - gchar **vlanguages; + GList *enabled_codes; - value = g_settings_get_string (preferences->gsettings_chat, - EMPATHY_PREFS_CHAT_SPELL_CHECKER_LANGUAGES); + enabled_codes = empathy_spell_get_enabled_language_codes (); - if (value == NULL) - return; + g_settings_set_boolean (priv->gsettings_chat, + EMPATHY_PREFS_CHAT_SPELL_CHECKER_ENABLED, + enabled_codes != NULL); - vlanguages = g_strsplit (value, ",", -1); - g_free (value); + if (enabled_codes == NULL) + return; - view = GTK_TREE_VIEW (preferences->treeview_spell_checker); + view = GTK_TREE_VIEW (priv->treeview_spell_checker); model = gtk_tree_view_get_model (view); gtk_tree_model_foreach (model, (GtkTreeModelForeachFunc) preferences_languages_load_foreach, - vlanguages); + enabled_codes); - g_strfreev (vlanguages); + g_list_free (enabled_codes); } static gboolean preferences_languages_load_foreach (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, - gchar **languages) + GList *languages) { gchar *code; - gchar *lang; - gint i; gboolean found = FALSE; if (!languages) { @@ -589,10 +535,8 @@ preferences_languages_load_foreach (GtkTreeModel *model, return FALSE; } - for (i = 0, lang = languages[i]; lang; lang = languages[++i]) { - if (!tp_strdiff (lang, code)) { - found = TRUE; - } + if (g_list_find_custom (languages, code, (GCompareFunc) strcmp)) { + found = TRUE; } g_free (code); @@ -605,6 +549,7 @@ preferences_languages_cell_toggled_cb (GtkCellRendererToggle *cell, gchar *path_string, EmpathyPreferences *preferences) { + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); GtkTreeView *view; GtkTreeModel *model; GtkListStore *store; @@ -612,7 +557,7 @@ preferences_languages_cell_toggled_cb (GtkCellRendererToggle *cell, GtkTreeIter iter; gboolean enabled; - view = GTK_TREE_VIEW (preferences->treeview_spell_checker); + view = GTK_TREE_VIEW (priv->treeview_spell_checker); model = gtk_tree_view_get_model (view); store = GTK_LIST_STORE (model); @@ -630,146 +575,369 @@ preferences_languages_cell_toggled_cb (GtkCellRendererToggle *cell, } static void -preferences_theme_notify_cb (GSettings *gsettings, - const gchar *key, - gpointer user_data) +preferences_preview_theme_append_message (EmpathyThemeAdium *view, + EmpathyContact *sender, + EmpathyContact *receiver, + const gchar *text, + gboolean should_highlight) +{ + EmpathyMessage *message; + + message = g_object_new (EMPATHY_TYPE_MESSAGE, + "sender", sender, + "receiver", receiver, + "body", text, + NULL); + + empathy_theme_adium_append_message (view, message, should_highlight); + g_object_unref (message); +} + +static void +preferences_preview_theme_changed_cb (EmpathyThemeManager *manager, + EmpathyPreferences *preferences) +{ + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); + EmpathyClientFactory *factory; + TpAccount *account; + EmpathyContact *juliet; + EmpathyContact *romeo; + + DEBUG ("Theme changed, update preview widget"); + + if (priv->chat_theme_preview != NULL) { + gtk_widget_destroy (GTK_WIDGET (priv->chat_theme_preview)); + } + priv->chat_theme_preview = empathy_theme_manager_create_view (manager); + gtk_container_add (GTK_CONTAINER (priv->sw_chat_theme_preview), + GTK_WIDGET (priv->chat_theme_preview)); + gtk_widget_show (GTK_WIDGET (priv->chat_theme_preview)); + + /* FIXME: It is ugly to add a fake conversation like that. + * Would be cool if we could request a TplLogManager for a fake + * conversation */ + factory = empathy_client_factory_dup (); + + account = tp_simple_client_factory_ensure_account ( + TP_SIMPLE_CLIENT_FACTORY (factory), + TP_ACCOUNT_OBJECT_PATH_BASE "cm/jabber/account", NULL, NULL); + juliet = g_object_new (EMPATHY_TYPE_CONTACT, + "account", account, + "id", "juliet", + /* translators: Contact name for the chat theme preview */ + "alias", _("Juliet"), + "is-user", FALSE, + NULL); + romeo = g_object_new (EMPATHY_TYPE_CONTACT, + "account", account, + "id", "romeo", + /* translators: Contact name for the chat theme preview */ + "alias", _("Romeo"), + "is-user", TRUE, + NULL); + + preferences_preview_theme_append_message (priv->chat_theme_preview, + /* translators: Quote from Romeo & Julier, for chat theme preview */ + juliet, romeo, _("O Romeo, Romeo, wherefore art thou Romeo?"), + TRUE /* this message mentions Romeo */); + preferences_preview_theme_append_message (priv->chat_theme_preview, + /* translators: Quote from Romeo & Julier, for chat theme preview */ + juliet, romeo, _("Deny thy father and refuse thy name;"), FALSE); + preferences_preview_theme_append_message (priv->chat_theme_preview, + /* translators: Quote from Romeo & Julier, for chat theme preview */ + juliet, romeo, _("Or if thou wilt not, be but sworn my love"), FALSE); + preferences_preview_theme_append_message (priv->chat_theme_preview, + /* translators: Quote from Romeo & Julier, for chat theme preview */ + juliet, romeo, _("And I'll no longer be a Capulet."), FALSE); + preferences_preview_theme_append_message (priv->chat_theme_preview, + /* translators: Quote from Romeo & Julier, for chat theme preview */ + romeo, juliet, _("Shall I hear more, or shall I speak at this?"), FALSE); + + /* translators: Quote from Romeo & Julier, for chat theme preview */ + empathy_theme_adium_append_event (priv->chat_theme_preview, _("Juliet has disconnected")); + + g_object_unref (juliet); + g_object_unref (romeo); + g_object_unref (account); + g_object_unref (factory); +} + +static void +preferences_theme_variant_changed_cb (GtkComboBox *combo, + EmpathyPreferences *preferences) +{ + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); + GtkTreeIter iter; + + if (gtk_combo_box_get_active_iter (combo, &iter)) { + GtkTreeModel *model; + gchar *name; + + model = gtk_combo_box_get_model (combo); + gtk_tree_model_get (model, &iter, + COL_VARIANT_NAME, &name, + -1); + + g_settings_set_string (priv->gsettings_chat, + EMPATHY_PREFS_CHAT_THEME_VARIANT, + name); + + g_free (name); + } +} + +static void +preferences_theme_variant_notify_cb (GSettings *gsettings, + const gchar *key, + gpointer user_data) { EmpathyPreferences *preferences = user_data; + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); GtkComboBox *combo; gchar *conf_name; - gchar *conf_path; GtkTreeModel *model; GtkTreeIter iter; + GtkTreeIter default_iter; + gboolean found_default = FALSE; gboolean found = FALSE; + gboolean ok; - conf_name = g_settings_get_string (gsettings, EMPATHY_PREFS_CHAT_THEME); - conf_path = g_settings_get_string (gsettings, EMPATHY_PREFS_CHAT_ADIUM_PATH); - - combo = GTK_COMBO_BOX (preferences->combobox_chat_theme); + conf_name = g_settings_get_string (gsettings, EMPATHY_PREFS_CHAT_THEME_VARIANT); + combo = GTK_COMBO_BOX (priv->combobox_chat_theme_variant); model = gtk_combo_box_get_model (combo); - if (gtk_tree_model_get_iter_first (model, &iter)) { - gboolean is_adium; + + for (ok = gtk_tree_model_get_iter_first (model, &iter); + ok && !found; + ok = gtk_tree_model_iter_next (model, &iter)) { gchar *name; - gchar *path; - - do { - gtk_tree_model_get (model, &iter, - COL_COMBO_IS_ADIUM, &is_adium, - COL_COMBO_NAME, &name, - COL_COMBO_PATH, &path, - -1); - - if (!tp_strdiff (name, conf_name)) { - if (tp_strdiff (name, "adium") || - !tp_strdiff (path, conf_path)) { - found = TRUE; - gtk_combo_box_set_active_iter (combo, &iter); - g_free (name); - g_free (path); - break; - } - } - - g_free (name); - g_free (path); - } while (gtk_tree_model_iter_next (model, &iter)); + gboolean is_default; + + gtk_tree_model_get (model, &iter, + COL_VARIANT_NAME, &name, + COL_VARIANT_DEFAULT, &is_default, + -1); + + if (!tp_strdiff (name, conf_name)) { + found = TRUE; + gtk_combo_box_set_active_iter (combo, &iter); + } + if (is_default) { + found_default = TRUE; + default_iter = iter; + } + + g_free (name); } /* Fallback to the first one. */ if (!found) { - if (gtk_tree_model_get_iter_first (model, &iter)) { + if (found_default) { + gtk_combo_box_set_active_iter (combo, &default_iter); + } else if (gtk_tree_model_get_iter_first (model, &iter)) { gtk_combo_box_set_active_iter (combo, &iter); } } g_free (conf_name); - g_free (conf_path); +} + +/* return TRUE if we added at least one variant */ +static gboolean +preferences_theme_variants_fill (EmpathyPreferences *preferences, + GHashTable *info) +{ + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); + GtkTreeModel *model; + GtkListStore *store; + GPtrArray *variants; + const gchar *default_variant; + guint i; + gboolean result = FALSE; + + model = gtk_combo_box_get_model (GTK_COMBO_BOX (priv->combobox_chat_theme_variant)); + store = GTK_LIST_STORE (model); + gtk_list_store_clear (store); + + variants = empathy_adium_info_get_available_variants (info); + default_variant = empathy_adium_info_get_default_variant (info); + for (i = 0; i < variants->len; i++) { + gchar *name = g_ptr_array_index (variants, i); + + gtk_list_store_insert_with_values (store, NULL, -1, + COL_VARIANT_NAME, name, + COL_VARIANT_DEFAULT, !tp_strdiff (name, default_variant), + -1); + + result = TRUE; + } + + /* Select the variant from the GSetting key */ + preferences_theme_variant_notify_cb (priv->gsettings_chat, + EMPATHY_PREFS_CHAT_THEME_VARIANT, + preferences); + + return result; +} + +static void +preferences_theme_variants_setup (EmpathyPreferences *preferences) +{ + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); + GtkComboBox *combo; + GtkCellLayout *cell_layout; + GtkCellRenderer *renderer; + GtkListStore *store; + + combo = GTK_COMBO_BOX (priv->combobox_chat_theme_variant); + cell_layout = GTK_CELL_LAYOUT (combo); + + /* Create the model */ + store = gtk_list_store_new (COL_VARIANT_COUNT, + G_TYPE_STRING, /* name */ + G_TYPE_BOOLEAN); /* is default */ + gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), + COL_VARIANT_NAME, GTK_SORT_ASCENDING); + + /* Add cell renderer */ + renderer = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (cell_layout, renderer, TRUE); + gtk_cell_layout_set_attributes (cell_layout, renderer, + "text", COL_VARIANT_NAME, NULL); + + gtk_combo_box_set_model (combo, GTK_TREE_MODEL (store)); + g_object_unref (store); + + g_signal_connect (combo, "changed", + G_CALLBACK (preferences_theme_variant_changed_cb), + preferences); + + /* Track changes of the GSetting key */ + g_signal_connect (priv->gsettings_chat, + "changed::" EMPATHY_PREFS_CHAT_THEME_VARIANT, + G_CALLBACK (preferences_theme_variant_notify_cb), + preferences); } static void preferences_theme_changed_cb (GtkComboBox *combo, EmpathyPreferences *preferences) { - GtkTreeModel *model; + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); GtkTreeIter iter; - gboolean is_adium; - gchar *name; - gchar *path; if (gtk_combo_box_get_active_iter (combo, &iter)) { - model = gtk_combo_box_get_model (combo); + GtkTreeModel *model; + gchar *name; + GHashTable *info; + gboolean variant; + model = gtk_combo_box_get_model (combo); gtk_tree_model_get (model, &iter, - COL_COMBO_IS_ADIUM, &is_adium, - COL_COMBO_NAME, &name, - COL_COMBO_PATH, &path, + COL_THEME_ADIUM_NAME, &name, + COL_THEME_ADIUM_INFO, &info, -1); - g_settings_set_string (preferences->gsettings_chat, + g_settings_set_string (priv->gsettings_chat, EMPATHY_PREFS_CHAT_THEME, name); - if (is_adium == TRUE) - g_settings_set_string (preferences->gsettings_chat, - EMPATHY_PREFS_CHAT_ADIUM_PATH, - path); + + variant = preferences_theme_variants_fill (preferences, info); + gtk_widget_set_visible (priv->hbox_chat_theme_variant, variant); + + g_free (name); + tp_clear_pointer (&info, g_hash_table_unref); + } +} + +static void +preferences_theme_notify_cb (GSettings *gsettings, + const gchar *key, + gpointer user_data) +{ + EmpathyPreferences *preferences = user_data; + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); + GtkComboBox *combo; + gchar *theme; + GtkTreeModel *model; + GtkTreeIter iter; + gboolean found = FALSE; + gboolean ok; + + theme = g_settings_get_string (gsettings, key); + + combo = GTK_COMBO_BOX (priv->combobox_chat_theme); + model = gtk_combo_box_get_model (combo); + for (ok = gtk_tree_model_get_iter_first (model, &iter); + ok && !found; + ok = gtk_tree_model_iter_next (model, &iter)) { + gchar *name; + + gtk_tree_model_get (model, &iter, + COL_THEME_ADIUM_NAME, &name, + -1); + + if (!tp_strdiff (name, theme)) { + found = TRUE; + gtk_combo_box_set_active_iter (combo, &iter); + } + g_free (name); - g_free (path); } + + /* Fallback to the first one. */ + if (!found) { + if (gtk_tree_model_get_iter_first (model, &iter)) { + gtk_combo_box_set_active_iter (combo, &iter); + } + } + + g_free (theme); } static void preferences_themes_setup (EmpathyPreferences *preferences) { + EmpathyPreferencesPriv *priv = GET_PRIV (preferences); GtkComboBox *combo; GtkCellLayout *cell_layout; GtkCellRenderer *renderer; GtkListStore *store; - const gchar **themes; GList *adium_themes; - gint i; - combo = GTK_COMBO_BOX (preferences->combobox_chat_theme); + preferences_theme_variants_setup (preferences); + + combo = GTK_COMBO_BOX (priv->combobox_chat_theme); cell_layout = GTK_CELL_LAYOUT (combo); /* Create the model */ - store = gtk_list_store_new (COL_COMBO_COUNT, - G_TYPE_BOOLEAN, /* Is an Adium theme */ - G_TYPE_STRING, /* Display name */ - G_TYPE_STRING, /* Theme name */ - G_TYPE_STRING); /* Theme path */ + store = gtk_list_store_new (COL_THEME_COUNT, + G_TYPE_STRING, /* Display name */ + G_TYPE_STRING, /* Adium theme path */ + G_TYPE_HASH_TABLE); /* Adium theme info */ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store), - COL_COMBO_VISIBLE_NAME, GTK_SORT_ASCENDING); + COL_THEME_VISIBLE_NAME, GTK_SORT_ASCENDING); /* Fill the model */ - themes = empathy_theme_manager_get_themes (); - for (i = 0; themes[i]; i += 2) { - gtk_list_store_insert_with_values (store, NULL, -1, - COL_COMBO_IS_ADIUM, FALSE, - COL_COMBO_VISIBLE_NAME, _(themes[i + 1]), - COL_COMBO_NAME, themes[i], - COL_COMBO_PATH, NULL, - -1); - } - adium_themes = empathy_theme_manager_get_adium_themes (); while (adium_themes != NULL) { GHashTable *info; - const gchar *name; - const gchar *path; + const gchar *visible_name; + gchar *name; info = adium_themes->data; - name = tp_asv_get_string (info, "CFBundleName"); - path = tp_asv_get_string (info, "path"); + visible_name = tp_asv_get_string (info, "CFBundleName"); + name = empathy_theme_manager_dup_theme_name_from_path ( + tp_asv_get_string (info, "path")); - if (name != NULL && path != NULL) { + if (visible_name != NULL && name != NULL) { gtk_list_store_insert_with_values (store, NULL, -1, - COL_COMBO_IS_ADIUM, TRUE, - COL_COMBO_VISIBLE_NAME, name, - COL_COMBO_NAME, "adium", - COL_COMBO_PATH, path, + COL_THEME_VISIBLE_NAME, visible_name, + COL_THEME_ADIUM_NAME, name, + COL_THEME_ADIUM_INFO, info, -1); } g_hash_table_unref (info); + g_free (name); adium_themes = g_list_delete_link (adium_themes, adium_themes); } @@ -777,7 +945,7 @@ preferences_themes_setup (EmpathyPreferences *preferences) renderer = gtk_cell_renderer_text_new (); gtk_cell_layout_pack_start (cell_layout, renderer, TRUE); gtk_cell_layout_set_attributes (cell_layout, renderer, - "text", COL_COMBO_VISIBLE_NAME, NULL); + "text", COL_THEME_VISIBLE_NAME, NULL); gtk_combo_box_set_model (combo, GTK_TREE_MODEL (store)); g_object_unref (store); @@ -787,102 +955,113 @@ preferences_themes_setup (EmpathyPreferences *preferences) preferences); /* Select the theme from the GSetting key and track changes */ - preferences_theme_notify_cb (preferences->gsettings_chat, + preferences_theme_notify_cb (priv->gsettings_chat, EMPATHY_PREFS_CHAT_THEME, preferences); - g_signal_connect (preferences->gsettings_chat, + + g_signal_connect (priv->gsettings_chat, "changed::" EMPATHY_PREFS_CHAT_THEME, G_CALLBACK (preferences_theme_notify_cb), preferences); +} - g_signal_connect (preferences->gsettings_chat, - "changed::" EMPATHY_PREFS_CHAT_ADIUM_PATH, - G_CALLBACK (preferences_theme_notify_cb), - preferences); +static void +empathy_preferences_response (GtkDialog *widget, + gint response) +{ + gtk_widget_destroy (GTK_WIDGET (widget)); } static void -preferences_response_cb (GtkWidget *widget, - gint response, - EmpathyPreferences *preferences) +empathy_preferences_finalize (GObject *self) { - gtk_widget_destroy (widget); + EmpathyPreferencesPriv *priv = GET_PRIV (self); + + g_object_unref (priv->theme_manager); + + g_object_unref (priv->gsettings); + g_object_unref (priv->gsettings_chat); + g_object_unref (priv->gsettings_call); + g_object_unref (priv->gsettings_loc); + g_object_unref (priv->gsettings_notify); + g_object_unref (priv->gsettings_sound); + g_object_unref (priv->gsettings_ui); + g_object_unref (priv->gsettings_logger); + + G_OBJECT_CLASS (empathy_preferences_parent_class)->finalize (self); } static void -preferences_destroy_cb (GtkWidget *widget, - EmpathyPreferences *preferences) +empathy_preferences_class_init (EmpathyPreferencesClass *klass) { - g_object_unref (preferences->gsettings); - g_object_unref (preferences->gsettings_chat); - g_object_unref (preferences->gsettings_loc); - g_object_unref (preferences->gsettings_notify); - g_object_unref (preferences->gsettings_sound); - g_object_unref (preferences->gsettings_ui); - - g_free (preferences); + GtkDialogClass *dialog_class = GTK_DIALOG_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + dialog_class->response = empathy_preferences_response; + + object_class->finalize = empathy_preferences_finalize; + + g_type_class_add_private (object_class, + sizeof (EmpathyPreferencesPriv)); } -GtkWidget * -empathy_preferences_show (GtkWindow *parent) +static void +empathy_preferences_init (EmpathyPreferences *preferences) { - static EmpathyPreferences *preferences; + EmpathyPreferencesPriv *priv; GtkBuilder *gui; gchar *filename; GtkWidget *page; - if (preferences) { - gtk_window_present (GTK_WINDOW (preferences->dialog)); - return preferences->dialog; - } + priv = preferences->priv = G_TYPE_INSTANCE_GET_PRIVATE (preferences, + EMPATHY_TYPE_PREFERENCES, EmpathyPreferencesPriv); + + gtk_dialog_add_button (GTK_DIALOG (preferences), + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); - preferences = g_new0 (EmpathyPreferences, 1); + gtk_container_set_border_width (GTK_CONTAINER (preferences), 5); + gtk_window_set_title (GTK_WINDOW (preferences), _("Preferences")); + gtk_window_set_role (GTK_WINDOW (preferences), "preferences"); + gtk_window_set_position (GTK_WINDOW (preferences), + GTK_WIN_POS_CENTER_ON_PARENT); + gtk_window_set_icon_name (GTK_WINDOW (preferences), "preferences-desktop"); filename = empathy_file_lookup ("empathy-preferences.ui", "src"); gui = empathy_builder_get_file (filename, - "preferences_dialog", &preferences->dialog, - "notebook", &preferences->notebook, - "checkbutton_show_smileys", &preferences->checkbutton_show_smileys, - "checkbutton_show_contacts_in_rooms", &preferences->checkbutton_show_contacts_in_rooms, - "combobox_chat_theme", &preferences->combobox_chat_theme, - "checkbutton_separate_chat_windows", &preferences->checkbutton_separate_chat_windows, - "checkbutton_autoconnect", &preferences->checkbutton_autoconnect, - "checkbutton_notifications_enabled", &preferences->checkbutton_notifications_enabled, - "checkbutton_notifications_disabled_away", &preferences->checkbutton_notifications_disabled_away, - "checkbutton_notifications_focus", &preferences->checkbutton_notifications_focus, - "checkbutton_notifications_contact_signin", &preferences->checkbutton_notifications_contact_signin, - "checkbutton_notifications_contact_signout", &preferences->checkbutton_notifications_contact_signout, - "checkbutton_sounds_enabled", &preferences->checkbutton_sounds_enabled, - "checkbutton_sounds_disabled_away", &preferences->checkbutton_sounds_disabled_away, - "treeview_sounds", &preferences->treeview_sounds, - "treeview_spell_checker", &preferences->treeview_spell_checker, - "checkbutton_location_publish", &preferences->checkbutton_location_publish, - "checkbutton_location_reduce_accuracy", &preferences->checkbutton_location_reduce_accuracy, - "checkbutton_location_resource_network", &preferences->checkbutton_location_resource_network, - "checkbutton_location_resource_cell", &preferences->checkbutton_location_resource_cell, - "checkbutton_location_resource_gps", &preferences->checkbutton_location_resource_gps, + "notebook", &priv->notebook, + "vbox_chat_theme", &priv->vbox_chat_theme, + "combobox_chat_theme", &priv->combobox_chat_theme, + "combobox_chat_theme_variant", &priv->combobox_chat_theme_variant, + "hbox_chat_theme_variant", &priv->hbox_chat_theme_variant, + "sw_chat_theme_preview", &priv->sw_chat_theme_preview, + "checkbutton_events_notif_area", &priv->checkbutton_events_notif_area, + "treeview_sounds", &priv->treeview_sounds, + "treeview_spell_checker", &priv->treeview_spell_checker, NULL); g_free (filename); - empathy_builder_connect (gui, preferences, - "preferences_dialog", "destroy", preferences_destroy_cb, - "preferences_dialog", "response", preferences_response_cb, - NULL); - - g_object_unref (gui); - - g_object_add_weak_pointer (G_OBJECT (preferences->dialog), (gpointer) &preferences); - - preferences->gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA); - preferences->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA); - preferences->gsettings_loc = g_settings_new (EMPATHY_PREFS_LOCATION_SCHEMA); - preferences->gsettings_notify = g_settings_new (EMPATHY_PREFS_NOTIFICATIONS_SCHEMA); - preferences->gsettings_sound = g_settings_new (EMPATHY_PREFS_SOUNDS_SCHEMA); - preferences->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA); + gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (preferences))), priv->notebook); + gtk_widget_show (priv->notebook); + + priv->gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA); + priv->gsettings_chat = g_settings_new (EMPATHY_PREFS_CHAT_SCHEMA); + priv->gsettings_call = g_settings_new (EMPATHY_PREFS_CALL_SCHEMA); + priv->gsettings_loc = g_settings_new (EMPATHY_PREFS_LOCATION_SCHEMA); + priv->gsettings_notify = g_settings_new (EMPATHY_PREFS_NOTIFICATIONS_SCHEMA); + priv->gsettings_sound = g_settings_new (EMPATHY_PREFS_SOUNDS_SCHEMA); + priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA); + priv->gsettings_logger = g_settings_new (EMPATHY_PREFS_LOGGER_SCHEMA); + + /* Create chat theme preview, and track changes */ + priv->theme_manager = empathy_theme_manager_dup_singleton (); + tp_g_signal_connect_object (priv->theme_manager, "theme-changed", + G_CALLBACK (preferences_preview_theme_changed_cb), + preferences, 0); + preferences_preview_theme_changed_cb (priv->theme_manager, preferences); preferences_themes_setup (preferences); - preferences_setup_widgets (preferences); + preferences_setup_widgets (preferences, gui); preferences_languages_setup (preferences); preferences_languages_add (preferences); @@ -891,26 +1070,83 @@ empathy_preferences_show (GtkWindow *parent) preferences_sound_setup (preferences); preferences_sound_load (preferences); + g_object_unref (gui); + if (empathy_spell_supported ()) { - page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (preferences->notebook), 2); + page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), EMPATHY_PREFERENCES_TAB_SPELL); gtk_widget_show (page); } - page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (preferences->notebook), 3); -#if HAVE_GEOCLUE + page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), EMPATHY_PREFERENCES_TAB_LOCATION); +#ifdef HAVE_GEOCLUE gtk_widget_show (page); #else gtk_widget_hide (page); #endif +} + +static EmpathyPreferencesTab +empathy_preferences_tab_from_string (const gchar *str) +{ + guint i; + for (i = 0; i < G_N_ELEMENTS (empathy_preferences_tabs); i++) + { + if (!tp_strdiff (str, empathy_preferences_tabs[i])) + return i; + } - if (parent) { - gtk_window_set_transient_for (GTK_WINDOW (preferences->dialog), - GTK_WINDOW (parent)); + g_warn_if_reached (); + return -1; +} + +const gchar * +empathy_preferences_tab_to_string (EmpathyPreferencesTab tab) +{ + g_return_val_if_fail (tab < G_N_ELEMENTS (empathy_preferences_tabs), NULL); + + return empathy_preferences_tabs[tab]; +} + +GtkWidget * +empathy_preferences_new (GtkWindow *parent, + gboolean shell_running) +{ + GtkWidget *self; + EmpathyPreferencesPriv *priv; + GtkWidget *notif_page; + + g_return_val_if_fail (parent == NULL || GTK_IS_WINDOW (parent), NULL); + + self = g_object_new (EMPATHY_TYPE_PREFERENCES, NULL); + + if (parent != NULL) { + gtk_window_set_transient_for (GTK_WINDOW (self), + parent); } - gtk_widget_show (preferences->dialog); + /* when running in Gnome Shell we must hide these options since they + * are meaningless in that context: + * - 'Display incoming events in the notification area' (General->Behavior) + * - 'Notifications' tab + */ + priv = GET_PRIV (self); + if (shell_running) { + gtk_widget_hide (priv->checkbutton_events_notif_area); + notif_page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), + EMPATHY_PREFERENCES_TAB_NOTIFICATIONS); + gtk_widget_hide (notif_page); + } - return preferences->dialog; + return self; } +void +empathy_preferences_show_tab (EmpathyPreferences *self, + const gchar *page) +{ + EmpathyPreferencesPriv *priv = GET_PRIV (self); + + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), + empathy_preferences_tab_from_string (page)); +}