diff options
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-avatar-image.c | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-location-manager.c | 17 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-theme-boxes.c | 37 |
3 files changed, 17 insertions, 41 deletions
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c index ef4185ae9..97818554f 100644 --- a/libempathy-gtk/empathy-avatar-image.c +++ b/libempathy-gtk/empathy-avatar-image.c @@ -313,9 +313,7 @@ empathy_avatar_image_set (EmpathyAvatarImage *avatar_image, } if (!priv->pixbuf) { - gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), - "stock_person", - GTK_ICON_SIZE_DIALOG); + gtk_image_clear (GTK_IMAGE (priv->image)); return; } diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index 0165052e1..0a9d4dcf7 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -38,7 +38,6 @@ #include "libempathy/empathy-enum-types.h" #include "libempathy/empathy-location.h" -#include "libempathy/empathy-tp-contact-factory.h" #include "libempathy/empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION @@ -183,6 +182,16 @@ empathy_location_manager_class_init (EmpathyLocationManagerClass *class) } static void +publish_location_cb (TpConnection *connection, + const GError *error, + gpointer user_data, + GObject *weak_object) +{ + if (error != NULL) + DEBUG ("Error setting location: %s", error->message); +} + +static void publish_location (EmpathyLocationManager *self, TpConnection *conn, gboolean force_publication) @@ -191,7 +200,6 @@ publish_location (EmpathyLocationManager *self, guint connection_status = -1; gboolean can_publish; EmpathyConf *conf = empathy_conf_get (); - EmpathyTpContactFactory *factory; if (!conn) return; @@ -215,9 +223,8 @@ publish_location (EmpathyLocationManager *self, (g_hash_table_size (priv->location) == 0 ? "empty" : ""), conn); - factory = empathy_tp_contact_factory_dup_singleton (conn); - empathy_tp_contact_factory_set_location (factory, priv->location); - g_object_unref (factory); + tp_cli_connection_interface_location_call_set_location (conn, -1, + priv->location, publish_location_cb, NULL, NULL, G_OBJECT (self)); } typedef struct diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c index 3a600a81d..29fb934f4 100644 --- a/libempathy-gtk/empathy-theme-boxes.c +++ b/libempathy-gtk/empathy-theme-boxes.c @@ -47,7 +47,6 @@ #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyThemeBoxes) typedef struct { gboolean show_avatars; - guint notify_show_avatars_id; } EmpathyThemeBoxesPriv; G_DEFINE_TYPE (EmpathyThemeBoxes, empathy_theme_boxes, EMPATHY_TYPE_CHAT_TEXT_VIEW); @@ -362,27 +361,6 @@ theme_boxes_append_message (EmpathyChatTextView *view, } static void -theme_boxes_notify_show_avatars_cb (EmpathyConf *conf, - const gchar *key, - gpointer user_data) -{ - EmpathyThemeBoxesPriv *priv = GET_PRIV (user_data); - - empathy_conf_get_bool (conf, key, &priv->show_avatars); -} - -static void -theme_boxes_finalize (GObject *object) -{ - EmpathyThemeBoxesPriv *priv = GET_PRIV (object); - - empathy_conf_notify_remove (empathy_conf_get (), - priv->notify_show_avatars_id); - - G_OBJECT_CLASS (empathy_theme_boxes_parent_class)->finalize (object); -} - -static void empathy_theme_boxes_class_init (EmpathyThemeBoxesClass *class) { GObjectClass *object_class; @@ -391,7 +369,6 @@ empathy_theme_boxes_class_init (EmpathyThemeBoxesClass *class) object_class = G_OBJECT_CLASS (class); chat_text_view_class = EMPATHY_CHAT_TEXT_VIEW_CLASS (class); - object_class->finalize = theme_boxes_finalize; chat_text_view_class->append_message = theme_boxes_append_message; g_type_class_add_private (object_class, sizeof (EmpathyThemeBoxesPriv)); @@ -405,17 +382,11 @@ empathy_theme_boxes_init (EmpathyThemeBoxes *theme) theme->priv = priv; - theme_boxes_create_tags (theme); - - priv->notify_show_avatars_id = - empathy_conf_notify_add (empathy_conf_get (), - EMPATHY_PREFS_UI_SHOW_AVATARS, - theme_boxes_notify_show_avatars_cb, - theme); + /* This is just hard-coded to TRUE until someone adds a tickybox in the + * Theme tab for it. */ + priv->show_avatars = TRUE; - empathy_conf_get_bool (empathy_conf_get (), - EMPATHY_PREFS_UI_SHOW_AVATARS, - &priv->show_avatars); + theme_boxes_create_tags (theme); /* Define margin */ g_object_set (theme, |