aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-preferences.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/empathy-preferences.c')
-rw-r--r--src/empathy-preferences.c223
1 files changed, 72 insertions, 151 deletions
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 0e2299cac..65c496547 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -28,6 +28,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
+#include <telepathy-glib/dbus.h>
#include <libempathy/empathy-utils.h>
@@ -49,18 +50,11 @@ typedef struct {
GtkWidget *notebook;
- GtkWidget *checkbutton_show_avatars;
- GtkWidget *checkbutton_compact_contact_list;
GtkWidget *checkbutton_show_smileys;
GtkWidget *checkbutton_show_contacts_in_rooms;
GtkWidget *combobox_chat_theme;
- GtkWidget *hbox_adium_theme;
- GtkWidget *filechooserbutton_adium_theme;
- GtkWidget *label_invalid_adium_theme;
GtkWidget *checkbutton_separate_chat_windows;
GtkWidget *checkbutton_autoconnect;
- GtkWidget *radiobutton_contact_list_sort_by_name;
- GtkWidget *radiobutton_contact_list_sort_by_state;
GtkWidget *checkbutton_sounds_enabled;
GtkWidget *checkbutton_sounds_disabled_away;
@@ -101,11 +95,6 @@ static void preferences_languages_cell_toggled_cb (GtkCellRendererToggle
EmpathyPreferences *preferences);
static void preferences_widget_sync_bool (const gchar *key,
GtkWidget *widget);
-static void preferences_widget_sync_string (const gchar *key,
- GtkWidget *widget);
-static void preferences_notify_string_cb (EmpathyConf *conf,
- const gchar *key,
- gpointer user_data);
static void preferences_notify_bool_cb (EmpathyConf *conf,
const gchar *key,
gpointer user_data);
@@ -115,16 +104,11 @@ static void preferences_notify_sensitivity_cb (EmpathyConf
static void preferences_hookup_toggle_button (EmpathyPreferences *preferences,
const gchar *key,
GtkWidget *widget);
-static void preferences_hookup_radio_button (EmpathyPreferences *preferences,
- const gchar *key,
- GtkWidget *widget);
static void preferences_hookup_sensitivity (EmpathyPreferences *preferences,
const gchar *key,
GtkWidget *widget);
static void preferences_toggle_button_toggled_cb (GtkWidget *button,
gpointer user_data);
-static void preferences_radio_button_toggled_cb (GtkWidget *button,
- gpointer user_data);
static void preferences_destroy_cb (GtkWidget *widget,
EmpathyPreferences *preferences);
static void preferences_response_cb (GtkWidget *widget,
@@ -139,8 +123,10 @@ enum {
};
enum {
+ COL_COMBO_IS_ADIUM,
COL_COMBO_VISIBLE_NAME,
COL_COMBO_NAME,
+ COL_COMBO_PATH,
COL_COMBO_COUNT
};
@@ -175,24 +161,8 @@ preferences_add_id (EmpathyPreferences *preferences, guint id)
}
static void
-preferences_compact_contact_list_changed_cb (EmpathyConf *conf,
- const gchar *key,
- gpointer user_data)
-{
- EmpathyPreferences *preferences = user_data;
- gboolean value;
-
- if (empathy_conf_get_bool (empathy_conf_get (), key, &value)) {
- gtk_widget_set_sensitive (preferences->checkbutton_show_avatars,
- !value);
- }
-}
-
-static void
preferences_setup_widgets (EmpathyPreferences *preferences)
{
- guint id;
-
preferences_hookup_toggle_button (preferences,
EMPATHY_PREFS_NOTIFICATIONS_ENABLED,
preferences->checkbutton_notifications_enabled);
@@ -241,14 +211,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
preferences->checkbutton_separate_chat_windows);
preferences_hookup_toggle_button (preferences,
- EMPATHY_PREFS_UI_SHOW_AVATARS,
- preferences->checkbutton_show_avatars);
-
- preferences_hookup_toggle_button (preferences,
- EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
- preferences->checkbutton_compact_contact_list);
-
- preferences_hookup_toggle_button (preferences,
EMPATHY_PREFS_CHAT_SHOW_SMILEYS,
preferences->checkbutton_show_smileys);
@@ -256,10 +218,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
EMPATHY_PREFS_CHAT_SHOW_CONTACTS_IN_ROOMS,
preferences->checkbutton_show_contacts_in_rooms);
- preferences_hookup_radio_button (preferences,
- EMPATHY_PREFS_CONTACTS_SORT_CRITERIUM,
- preferences->radiobutton_contact_list_sort_by_name);
-
preferences_hookup_toggle_button (preferences,
EMPATHY_PREFS_AUTOCONNECT,
preferences->checkbutton_autoconnect);
@@ -295,17 +253,6 @@ preferences_setup_widgets (EmpathyPreferences *preferences)
preferences_hookup_sensitivity (preferences,
EMPATHY_PREFS_LOCATION_PUBLISH,
preferences->checkbutton_location_reduce_accuracy);
-
- id = empathy_conf_notify_add (empathy_conf_get (),
- EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
- preferences_compact_contact_list_changed_cb,
- preferences);
- if (id) {
- preferences_add_id (preferences, id);
- }
- preferences_compact_contact_list_changed_cb (empathy_conf_get (),
- EMPATHY_PREFS_UI_COMPACT_CONTACT_LIST,
- preferences);
}
static void
@@ -659,6 +606,7 @@ preferences_widget_sync_bool (const gchar *key, GtkWidget *widget)
}
}
+#if 0
static void
preferences_widget_sync_string (const gchar *key, GtkWidget *widget)
{
@@ -701,7 +649,7 @@ preferences_notify_string_cb (EmpathyConf *conf,
{
preferences_widget_sync_string (key, user_data);
}
-
+#endif
static void
preferences_notify_bool_cb (EmpathyConf *conf,
@@ -849,6 +797,7 @@ preferences_hookup_toggle_button (EmpathyPreferences *preferences,
}
}
+#if 0
static void
preferences_hookup_radio_button (EmpathyPreferences *preferences,
const gchar *key,
@@ -878,6 +827,7 @@ preferences_hookup_radio_button (EmpathyPreferences *preferences,
preferences_add_id (preferences, id);
}
}
+#endif
static void
preferences_hookup_sensitivity (EmpathyPreferences *preferences,
@@ -913,6 +863,7 @@ preferences_toggle_button_toggled_cb (GtkWidget *button,
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)));
}
+#if 0
static void
preferences_radio_button_toggled_cb (GtkWidget *button,
gpointer user_data)
@@ -952,73 +903,7 @@ preferences_radio_button_toggled_cb (GtkWidget *button,
empathy_conf_set_string (empathy_conf_get (), key, value);
}
-
-
-static void
-preferences_theme_adium_update_visibility (EmpathyPreferences *preferences,
- const gchar *name)
-{
- if (name && strcmp (name, "adium") == 0) {
- gtk_widget_show (preferences->hbox_adium_theme);
- } else {
- gtk_widget_hide (preferences->hbox_adium_theme);
- gtk_widget_hide (preferences->label_invalid_adium_theme);
- }
-}
-
-static void
-preferences_theme_adium_update_validity (EmpathyPreferences *preferences,
- const gchar *path)
-{
-#ifdef HAVE_WEBKIT
- if (empathy_adium_path_is_valid (path)) {
- gtk_widget_hide (preferences->label_invalid_adium_theme);
- } else {
- gtk_widget_show (preferences->label_invalid_adium_theme);
- }
#endif
-}
-
-static void
-preferences_theme_adium_path_notify_cb (EmpathyConf *conf,
- const gchar *key,
- gpointer user_data)
-{
- EmpathyPreferences *preferences = user_data;
- GtkFileChooser *chooser;
- gchar *value;
- const gchar *path;
-
- if (!empathy_conf_get_string (conf, key, &value)) {
- return;
- }
-
- if (EMP_STR_EMPTY (value)) {
- path = g_get_home_dir ();
- } else {
- path = value;
- }
-
- chooser = GTK_FILE_CHOOSER (preferences->filechooserbutton_adium_theme);
- gtk_file_chooser_set_current_folder (chooser, path);
- preferences_theme_adium_update_validity (preferences, path);
- g_free (value);
-}
-
-static void
-preferences_theme_adium_file_set_cb (GtkFileChooser *chooser,
- EmpathyPreferences *preferences)
-{
- gchar *path;
-
- path = gtk_file_chooser_get_current_folder (chooser);
- empathy_conf_set_string (empathy_conf_get (),
- EMPATHY_PREFS_CHAT_ADIUM_PATH,
- path);
- preferences_theme_adium_update_validity (preferences, path);
-
- g_free (path);
-}
static void
preferences_theme_notify_cb (EmpathyConf *conf,
@@ -1027,34 +912,48 @@ preferences_theme_notify_cb (EmpathyConf *conf,
{
EmpathyPreferences *preferences = user_data;
GtkComboBox *combo;
- gchar *value;
+ gchar *conf_name;
+ gchar *conf_path;
GtkTreeModel *model;
GtkTreeIter iter;
gboolean found = FALSE;
- if (!empathy_conf_get_string (conf, key, &value)) {
+ if (!empathy_conf_get_string (conf, EMPATHY_PREFS_CHAT_THEME, &conf_name)) {
return;
}
- preferences_theme_adium_update_visibility (preferences, value);
+ if (!empathy_conf_get_string (conf, EMPATHY_PREFS_CHAT_ADIUM_PATH, &conf_path)) {
+ g_free (conf_name);
+ return;
+ }
combo = GTK_COMBO_BOX (preferences->combobox_chat_theme);
model = gtk_combo_box_get_model (combo);
- if (value && gtk_tree_model_get_iter_first (model, &iter)) {
+ if (gtk_tree_model_get_iter_first (model, &iter)) {
+ gboolean is_adium;
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 (strcmp (name, value) == 0) {
- found = TRUE;
- gtk_combo_box_set_active_iter (combo, &iter);
- break;
+ if (strcmp (name, conf_name) == 0) {
+ if (strcmp (name, "adium") != 0 ||
+ strcmp (path, conf_path) == 0) {
+ 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));
}
@@ -1065,7 +964,8 @@ preferences_theme_notify_cb (EmpathyConf *conf,
}
}
- g_free (value);
+ g_free (conf_name);
+ g_free (conf_path);
}
static void
@@ -1074,21 +974,28 @@ preferences_theme_changed_cb (GtkComboBox *combo,
{
GtkTreeModel *model;
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);
gtk_tree_model_get (model, &iter,
+ COL_COMBO_IS_ADIUM, &is_adium,
COL_COMBO_NAME, &name,
+ COL_COMBO_PATH, &path,
-1);
- preferences_theme_adium_update_visibility (preferences, name);
-
empathy_conf_set_string (empathy_conf_get (),
EMPATHY_PREFS_CHAT_THEME,
name);
+ if (is_adium == TRUE)
+ empathy_conf_set_string (empathy_conf_get (),
+ EMPATHY_PREFS_CHAT_ADIUM_PATH,
+ path);
g_free (name);
+ g_free (path);
}
}
@@ -1100,6 +1007,7 @@ preferences_themes_setup (EmpathyPreferences *preferences)
GtkCellRenderer *renderer;
GtkListStore *store;
const gchar **themes;
+ GList *adium_themes;
gint i;
guint id;
@@ -1108,18 +1016,46 @@ preferences_themes_setup (EmpathyPreferences *preferences)
/* 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 name */
+ G_TYPE_STRING); /* Theme path */
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (store),
+ COL_COMBO_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;
+
+ info = adium_themes->data;
+ name = tp_asv_get_string (info, "CFBundleName");
+ path = tp_asv_get_string (info, "path");
+
+ if (name != NULL && path != 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,
+ -1);
+ }
+ g_hash_table_unref (info);
+ adium_themes = g_list_delete_link (adium_themes, adium_themes);
+ }
+
/* Add cell renderer */
renderer = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (cell_layout, renderer, TRUE);
@@ -1145,17 +1081,9 @@ preferences_themes_setup (EmpathyPreferences *preferences)
preferences_add_id (preferences, id);
}
- g_signal_connect (preferences->filechooserbutton_adium_theme,
- "file-set",
- G_CALLBACK (preferences_theme_adium_file_set_cb),
- preferences);
- /* Select the adium path from the gconf key and track changes */
- preferences_theme_adium_path_notify_cb (empathy_conf_get (),
- EMPATHY_PREFS_CHAT_ADIUM_PATH,
- preferences);
id = empathy_conf_notify_add (empathy_conf_get (),
EMPATHY_PREFS_CHAT_ADIUM_PATH,
- preferences_theme_adium_path_notify_cb,
+ preferences_theme_notify_cb,
preferences);
if (id) {
preferences_add_id (preferences, id);
@@ -1206,18 +1134,11 @@ empathy_preferences_show (GtkWindow *parent)
gui = empathy_builder_get_file (filename,
"preferences_dialog", &preferences->dialog,
"notebook", &preferences->notebook,
- "checkbutton_show_avatars", &preferences->checkbutton_show_avatars,
- "checkbutton_compact_contact_list", &preferences->checkbutton_compact_contact_list,
"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,
- "hbox_adium_theme", &preferences->hbox_adium_theme,
- "filechooserbutton_adium_theme", &preferences->filechooserbutton_adium_theme,
- "label_invalid_adium_theme", &preferences->label_invalid_adium_theme,
"checkbutton_separate_chat_windows", &preferences->checkbutton_separate_chat_windows,
"checkbutton_autoconnect", &preferences->checkbutton_autoconnect,
- "radiobutton_contact_list_sort_by_name", &preferences->radiobutton_contact_list_sort_by_name,
- "radiobutton_contact_list_sort_by_state", &preferences->radiobutton_contact_list_sort_by_state,
"checkbutton_notifications_enabled", &preferences->checkbutton_notifications_enabled,
"checkbutton_notifications_disabled_away", &preferences->checkbutton_notifications_disabled_away,
"checkbutton_notifications_focus", &preferences->checkbutton_notifications_focus,
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-21 19:24:23 +0800