Merge branch 'sasl'

[empathy.git] / libempathy-gtk / empathy-avatar-chooser.c

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 6e6c2831049d3fc751aade43a097a93e403b7ba8..98bb44614e444b1a5a0a756d63cfa19e2ecfc889 100644 (file)
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -29,10 +29,10 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
+#include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-avatar-chooser.h"
-#include "empathy-conf.h"
 #include "empathy-images.h"
 #include "empathy-ui-utils.h"
 
@@ -68,6 +68,7 @@ typedef struct {
        gulong ready_handler_id;
 
        EmpathyAvatar *avatar;
+       GSettings *gsettings_ui;
 } EmpathyAvatarChooserPriv;
 
 static void       avatar_chooser_finalize              (GObject              *object);
@@ -226,6 +227,8 @@ empathy_avatar_chooser_init (EmpathyAvatarChooser *chooser)
                           G_N_ELEMENTS (drop_types),
                           GDK_ACTION_COPY);
 
+       priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA);
+
        g_signal_connect (chooser, "drag-motion",
                          G_CALLBACK (avatar_chooser_drag_motion_cb),
                          chooser);
@@ -259,6 +262,8 @@ avatar_chooser_finalize (GObject *object)
                empathy_avatar_unref (priv->avatar);
        }
 
+       g_object_unref (priv->gsettings_ui);
+
        G_OBJECT_CLASS (empathy_avatar_chooser_parent_class)->finalize (object);
 }
 
@@ -567,7 +572,7 @@ avatar_chooser_maybe_convert_and_scale (EmpathyAvatarChooser *chooser,
 
        /* Takes ownership of new_mime_type and best_image_data */
        avatar = empathy_avatar_new ((guchar *) best_image_data,
-               best_image_size, new_mime_type, NULL, NULL);
+               best_image_size, new_mime_type, NULL);
 
        return avatar;
 }
@@ -612,7 +617,7 @@ avatar_chooser_set_image_from_data (EmpathyAvatarChooser *chooser,
        }
 
        /* avatar takes ownership of data and mime_type */
-       avatar = empathy_avatar_new ((guchar *) data, size, mime_type, NULL, NULL);
+       avatar = empathy_avatar_new ((guchar *) data, size, mime_type, NULL);
 
        avatar_chooser_set_image (chooser, avatar, pixbuf, set_locally);
 }
@@ -725,7 +730,8 @@ avatar_chooser_drag_motion_cb (GtkWidget          *widget,
 
        priv = GET_PRIV (chooser);
 
-       for (p = context->targets; p != NULL; p = p->next) {
+       for (p = gdk_drag_context_list_targets (context); p != NULL;
+            p = p->next) {
                gchar *possible_type;
 
                possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data));
@@ -764,11 +770,12 @@ avatar_chooser_drag_drop_cb (GtkWidget          *widget,
 
        priv = GET_PRIV (chooser);
 
-       if (context->targets == NULL) {
+       if (gdk_drag_context_list_targets (context) == NULL) {
                return FALSE;
        }
 
-       for (p = context->targets; p != NULL; p = p->next) {
+       for (p = gdk_drag_context_list_targets (context);
+            p != NULL; p = p->next) {
                char *possible_type;
 
                possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data));
@@ -893,9 +900,10 @@ avatar_chooser_response_cb (GtkWidget            *widget,
 
                path = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (widget));
                if (path) {
-                       empathy_conf_set_string (empathy_conf_get (),
-                                                EMPATHY_PREFS_UI_AVATAR_DIRECTORY,
-                                                path);
+                       g_settings_set_string (priv->gsettings_ui,
+                                              EMPATHY_PREFS_UI_AVATAR_DIRECTORY,
+                                              path);
+
                        g_free (path);
                }
        }
@@ -939,9 +947,9 @@ avatar_chooser_clicked_cb (GtkWidget            *button,
        gtk_window_set_destroy_with_parent (GTK_WINDOW (chooser_dialog), TRUE);
 
        /* Get special dirs */
-       empathy_conf_get_string (empathy_conf_get (),
-                                EMPATHY_PREFS_UI_AVATAR_DIRECTORY,
-                                &saved_dir);
+       saved_dir = g_settings_get_string (priv->gsettings_ui,
+                                          EMPATHY_PREFS_UI_AVATAR_DIRECTORY);
+
        if (saved_dir && !g_file_test (saved_dir, G_FILE_TEST_IS_DIR)) {
                g_free (saved_dir);
                saved_dir = NULL;
@@ -1005,6 +1013,7 @@ avatar_chooser_clicked_cb (GtkWidget            *button,
                          chooser);
 
        gtk_widget_show (GTK_WIDGET (chooser_dialog));
+
        g_free (saved_dir);
 }
 
@@ -1016,7 +1025,7 @@ avatar_chooser_clicked_cb (GtkWidget            *button,
  * Return value: a new #EmpathyAvatarChooser
  */
 GtkWidget *
-empathy_avatar_chooser_new ()
+empathy_avatar_chooser_new (void)
 {
        return g_object_new (EMPATHY_TYPE_AVATAR_CHOOSER, NULL);
 }