diff options
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 15 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-chat.h | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-location-manager.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 11 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-notify-manager.c | 2 |
5 files changed, 16 insertions, 17 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index c6cc8e081..35f908b7b 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -46,7 +46,6 @@ #include "empathy-input-text-view.h" #include "empathy-request-util.h" #include "empathy-search-bar.h" -#include "empathy-smiley-manager.h" #include "empathy-spell.h" #include "empathy-string-parser.h" #include "empathy-theme-manager.h" @@ -2095,6 +2094,13 @@ chat_input_has_focus_notify_cb (GtkWidget *widget, empathy_theme_adium_focus_toggled (chat->view, gtk_widget_has_focus (widget)); } +void +empathy_chat_insert_smiley (GtkTextBuffer *buffer, + EmpathySmiley *smiley) +{ + gtk_text_buffer_insert_at_cursor (buffer, smiley->str, -1); +} + static void chat_insert_smiley_activate_cb (EmpathySmileyManager *manager, EmpathySmiley *smiley, @@ -2102,15 +2108,10 @@ chat_insert_smiley_activate_cb (EmpathySmileyManager *manager, { EmpathyChat *chat = EMPATHY_CHAT (user_data); GtkTextBuffer *buffer; - GtkTextIter iter; buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (chat->input_text_view)); - gtk_text_buffer_get_end_iter (buffer, &iter); - gtk_text_buffer_insert (buffer, &iter, smiley->str, -1); - - gtk_text_buffer_get_end_iter (buffer, &iter); - gtk_text_buffer_insert (buffer, &iter, " ", -1); + empathy_chat_insert_smiley (buffer, smiley); } typedef struct { diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h index 2a983622b..c73f5c1f9 100644 --- a/libempathy-gtk/empathy-chat.h +++ b/libempathy-gtk/empathy-chat.h @@ -33,6 +33,7 @@ #include "empathy-contact.h" #include "empathy-theme-adium.h" #include "empathy-tp-chat.h" +#include "empathy-smiley-manager.h" G_BEGIN_DECLS @@ -98,6 +99,8 @@ guint empathy_chat_get_n_messages_sending (EmpathyChat *self); gchar * empathy_chat_dup_text (EmpathyChat *self); void empathy_chat_set_text (EmpathyChat *self, const gchar *text); +void empathy_chat_insert_smiley (GtkTextBuffer *buffer, + EmpathySmiley *smiley); G_END_DECLS diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index 459adb28e..8787eb2c5 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -22,6 +22,8 @@ #include "config.h" #include "empathy-location-manager.h" +#include <telepathy-glib/telepathy-glib-dbus.h> + #include <tp-account-widgets/tpaw-time.h> #include "empathy-gsettings.h" diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 2a9ba6724..55202d3be 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -881,8 +881,7 @@ maybe_refresh_logs (TpChannel *channel, if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_TEXT) && !(event_mask & TPL_EVENT_MASK_TEXT)) goto out; - if ((!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA) || - !tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL)) && + if ((!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL)) && !(event_mask & TPL_EVENT_MASK_CALL)) goto out; @@ -1024,8 +1023,7 @@ observe_channels (TpSimpleObserver *observer, tp_g_signal_connect_object (channel, "invalidated", G_CALLBACK (on_channel_ended), self, 0); } - else if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL) || - !tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) + else if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL)) { g_hash_table_insert (self->priv->channels, g_object_ref (channel), g_object_ref (account)); @@ -1064,11 +1062,6 @@ log_window_create_observer (EmpathyLogWindow *self) tp_base_client_take_observer_filter (self->priv->observer, tp_asv_new ( TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, - TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, - NULL)); - tp_base_client_take_observer_filter (self->priv->observer, - tp_asv_new ( - TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL, NULL)); diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c index 8ca97950e..bbe3a1a4c 100644 --- a/libempathy-gtk/empathy-notify-manager.c +++ b/libempathy-gtk/empathy-notify-manager.c @@ -190,7 +190,7 @@ empathy_notify_manager_notification_is_enabled (EmpathyNotifyManager *self) EMPATHY_PREFS_NOTIFICATIONS_ENABLED)) return FALSE; - if (!tp_account_manager_is_prepared (priv->account_manager, + if (!tp_proxy_is_prepared (priv->account_manager, TP_ACCOUNT_MANAGER_FEATURE_CORE)) { DEBUG ("account manager is not ready yet; display the notification"); |