aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/bbdb
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-04-22 02:52:23 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-04-22 05:07:15 +0800
commit7950d6a0c6efd6c4d48afd99c138f38952bdd1bb (patch)
tree3a8fd7957dd29441120d2db18ccb1cc23f5935f2 /plugins/bbdb
parent397b15ff4aa5afd1d5c7e0a093a33616624401cf (diff)
downloadgsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.gz
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.bz2
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.lz
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.xz
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.tar.zst
gsoc2013-evolution-7950d6a0c6efd6c4d48afd99c138f38952bdd1bb.zip
Adapt to libedataserver[ui] changes.
Diffstat (limited to 'plugins/bbdb')
-rw-r--r--plugins/bbdb/bbdb.c68
1 files changed, 45 insertions, 23 deletions
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 1fa392b09f..69115ddd02 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -427,9 +427,11 @@ bbdb_create_book_client (gint type)
/* Open the appropriate addresbook. */
if (type == GAIM_ADDRESSBOOK)
- uri = g_settings_get_string (settings, CONF_KEY_WHICH_ADDRESSBOOK_GAIM);
+ uri = g_settings_get_string (
+ settings, CONF_KEY_WHICH_ADDRESSBOOK_GAIM);
else
- uri = g_settings_get_string (settings, CONF_KEY_WHICH_ADDRESSBOOK);
+ uri = g_settings_get_string (
+ settings, CONF_KEY_WHICH_ADDRESSBOOK);
g_object_unref (G_OBJECT (settings));
if (uri == NULL)
@@ -520,12 +522,17 @@ enable_toggled_cb (GtkWidget *widget,
if (active && !addressbook) {
const gchar *uri = NULL;
- selected_source = e_source_combo_box_get_active (
+ selected_source = e_source_combo_box_ref_active (
E_SOURCE_COMBO_BOX (stuff->combo_box));
- if (selected_source != NULL)
+ if (selected_source != NULL) {
uri = e_source_get_uri (selected_source);
-
- g_settings_set_string (settings, CONF_KEY_WHICH_ADDRESSBOOK, uri ? uri : "");
+ g_settings_set_string (
+ settings, CONF_KEY_WHICH_ADDRESSBOOK, uri);
+ g_object_unref (selected_source);
+ } else {
+ g_settings_set_string (
+ settings, CONF_KEY_WHICH_ADDRESSBOOK, "");
+ }
}
g_free (addressbook);
@@ -547,12 +554,23 @@ enable_gaim_toggled_cb (GtkWidget *widget,
/* Save the new setting to GSettings */
g_settings_set_boolean (settings, CONF_KEY_ENABLE_GAIM, active);
- addressbook_gaim = g_settings_get_string (settings, CONF_KEY_WHICH_ADDRESSBOOK_GAIM);
+ addressbook_gaim = g_settings_get_string (
+ settings, CONF_KEY_WHICH_ADDRESSBOOK_GAIM);
gtk_widget_set_sensitive (stuff->gaim_combo_box, active);
if (active && !addressbook_gaim) {
- selected_source = e_source_combo_box_get_active (
+ const gchar *uri = NULL;
+
+ selected_source = e_source_combo_box_ref_active (
E_SOURCE_COMBO_BOX (stuff->gaim_combo_box));
- g_settings_set_string (settings, CONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source));
+ if (selected_source != NULL) {
+ uri = e_source_get_uri (selected_source);
+ g_settings_set_string (
+ settings, CONF_KEY_WHICH_ADDRESSBOOK_GAIM, uri);
+ g_object_unref (selected_source);
+ } else {
+ g_settings_set_string (
+ settings, CONF_KEY_WHICH_ADDRESSBOOK_GAIM, "");
+ }
}
g_free (addressbook_gaim);
@@ -569,34 +587,38 @@ static void
source_changed_cb (ESourceComboBox *source_combo_box,
struct bbdb_stuff *stuff)
{
+ GSettings *settings;
ESource *source;
- GSettings *settings = g_settings_new (CONF_SCHEMA);
-
- source = e_source_combo_box_get_active (source_combo_box);
+ const gchar *uri;
- g_settings_set_string (
- settings,
- CONF_KEY_WHICH_ADDRESSBOOK,
- source ? e_source_get_uri (source) : "");
+ source = e_source_combo_box_ref_active (source_combo_box);
+ uri = (source != NULL) ? e_source_get_uri (source) : "";
+ settings = g_settings_new (CONF_SCHEMA);
+ g_settings_set_string (settings, CONF_KEY_WHICH_ADDRESSBOOK, uri);
g_object_unref (settings);
+
+ if (source != NULL)
+ g_object_unref (source);
}
static void
gaim_source_changed_cb (ESourceComboBox *source_combo_box,
struct bbdb_stuff *stuff)
{
+ GSettings *settings;
ESource *source;
- GSettings *settings = g_settings_new (CONF_SCHEMA);
-
- source = e_source_combo_box_get_active (source_combo_box);
+ const gchar *uri;
- g_settings_set_string (
- settings,
- CONF_KEY_WHICH_ADDRESSBOOK_GAIM,
- source ? e_source_get_uri (source) : "");
+ source = e_source_combo_box_ref_active (source_combo_box);
+ uri = (source != NULL) ? e_source_get_uri (source) : "";
+ settings = g_settings_new (CONF_SCHEMA);
+ g_settings_set_string (settings, CONF_KEY_WHICH_ADDRESSBOOK_GAIM, uri);
g_object_unref (settings);
+
+ if (source != NULL)
+ g_object_unref (source);
}
static GtkWidget *