diff options
Diffstat (limited to 'src/empathy-main-window.c')
| -rw-r--r-- | src/empathy-main-window.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 5830d2b71..c7816d7fd 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -37,16 +37,17 @@ #include <libempathy/empathy-contact-manager.h> #include <libempathy/empathy-status-presets.h> +#include <libempathy-gtk/empathy-conf.h> #include <libempathy-gtk/empathy-contact-dialogs.h> #include <libempathy-gtk/empathy-contact-list-store.h> #include <libempathy-gtk/empathy-contact-list-view.h> -#include <libempathy-gtk/empathy-presence-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> #include <libempathy-gtk/empathy-geometry.h> -#include <libempathy-gtk/empathy-conf.h> -#include <libempathy-gtk/empathy-log-window.h> -#include <libempathy-gtk/empathy-new-message-dialog.h> #include <libempathy-gtk/empathy-gtk-enum-types.h> +#include <libempathy-gtk/empathy-new-message-dialog.h> +#include <libempathy-gtk/empathy-log-window.h> +#include <libempathy-gtk/empathy-presence-chooser.h> +#include <libempathy-gtk/empathy-sound.h> +#include <libempathy-gtk/empathy-ui-utils.h> #include <libmissioncontrol/mission-control.h> @@ -197,7 +198,7 @@ main_window_flash_cb (EmpathyMainWindow *window) events = empathy_event_manager_get_events (window->event_manager); for (l = events; l; l = l->next) { data.event = l->data; - if (!data.event->contact) { + if (!data.event->contact || !data.event->must_ack) { continue; } @@ -301,7 +302,7 @@ static void main_window_error_edit_clicked_cb (GtkButton *button, EmpathyMainWindow *window) { - McAccount *account; + EmpathyAccount *account; GtkWidget *error_widget; account = g_object_get_data (G_OBJECT (button), "account"); @@ -316,7 +317,7 @@ static void main_window_error_clear_clicked_cb (GtkButton *button, EmpathyMainWindow *window) { - McAccount *account; + EmpathyAccount *account; GtkWidget *error_widget; account = g_object_get_data (G_OBJECT (button), "account"); @@ -327,7 +328,7 @@ main_window_error_clear_clicked_cb (GtkButton *button, static void main_window_error_display (EmpathyMainWindow *window, - McAccount *account, + EmpathyAccount *account, const gchar *message) { GtkWidget *child; @@ -348,7 +349,7 @@ main_window_error_display (EmpathyMainWindow *window, /* Just set the latest error and return */ str = g_markup_printf_escaped ("<b>%s</b>\n%s", - mc_account_get_display_name (account), + empathy_account_get_display_name (account), message); gtk_label_set_markup (GTK_LABEL (label), str); g_free (str); @@ -429,7 +430,7 @@ main_window_error_display (EmpathyMainWindow *window, gtk_misc_set_alignment (GTK_MISC (label), 0, 0); str = g_markup_printf_escaped ("<b>%s</b>\n%s", - mc_account_get_display_name (account), + empathy_account_get_display_name (account), message); gtk_label_set_markup (GTK_LABEL (label), str); g_free (str); @@ -481,7 +482,7 @@ main_window_update_status (EmpathyMainWindow *window, EmpathyAccountManager *man static void main_window_connection_changed_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, TpConnectionStatusReason reason, TpConnectionStatus current, TpConnectionStatus previous, @@ -568,11 +569,11 @@ main_window_contact_presence_changed_cb (EmpathyContactMonitor *monitor, TpConnectionPresenceType previous, EmpathyMainWindow *window) { - McAccount *account; + EmpathyAccount *account; gboolean should_play; account = empathy_contact_get_account (contact); - should_play = !empathy_account_manager_is_account_just_connected (window->account_manager, account); + should_play = !empathy_account_is_just_connected (account); if (!should_play) { return; @@ -728,16 +729,13 @@ main_window_view_show_map_cb (GtkCheckMenuItem *item, static void main_window_favorite_chatroom_join (EmpathyChatroom *chatroom) { - EmpathyAccountManager *manager; - McAccount *account; + EmpathyAccount *account; TpConnection *connection; const gchar *room; - manager = empathy_account_manager_dup_singleton (); account = empathy_chatroom_get_account (chatroom); - connection = empathy_account_manager_get_connection (manager, account); + connection = empathy_account_get_connection (account); room = empathy_chatroom_get_room (chatroom); - g_object_unref (manager); if (connection != NULL) { DEBUG ("Requesting channel for '%s'", room); @@ -1008,7 +1006,7 @@ main_window_configure_event_cb (GtkWidget *widget, static void main_window_account_created_or_deleted_cb (EmpathyAccountManager *manager, - McAccount *account, + EmpathyAccount *account, EmpathyMainWindow *window) { gtk_action_set_sensitive (window->view_history, |