X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2Fempathy-roster-window.c;h=e584cdd3db3a851cb65866e3f26355533de45712;hp=c09094eb0b787c7e08129549635be54e511591d1;hb=8eef204e706a2a4c4b16c935b853ea207b775729;hpb=6bdef2ef6259bda727a2cbe3a827c4a39b73a7e8 diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index c09094eb..e584cdd3 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -26,6 +26,7 @@ #include #include +#include #include "empathy-about-dialog.h" #include "empathy-accounts-dialog.h" @@ -33,6 +34,7 @@ #include "empathy-chat-manager.h" #include "empathy-chatroom-manager.h" #include "empathy-chatrooms-window.h" +#include "empathy-client-factory.h" #include "empathy-contact-blocking-dialog.h" #include "empathy-contact-search-dialog.h" #include "empathy-event-manager.h" @@ -329,6 +331,14 @@ roster_window_load_events_idle_cb (gpointer user_data) return FALSE; } +static void +hide_search_bar (EmpathyRosterWindow *roster_window) +{ + if (TPAW_IS_LIVE_SEARCH (roster_window->priv->search_bar) && + gtk_widget_is_visible (roster_window->priv->search_bar)) + gtk_widget_hide (roster_window->priv->search_bar); +} + static void individual_activated_cb (EmpathyRosterView *self, FolksIndividual *individual, @@ -347,6 +357,9 @@ individual_activated_cb (EmpathyRosterView *self, empathy_chat_with_contact (contact, gtk_get_current_event_time ()); g_object_unref (contact); + + /* Hide the search-bar upon hitting "Enter" on an individual */ + hide_search_bar (EMPATHY_ROSTER_WINDOW (user_data)); } static void @@ -356,6 +369,9 @@ event_activated_cb (EmpathyRosterView *self, gpointer user_data) { empathy_event_activate (event); + + /* Hide the search-bar upon an event activation */ + hide_search_bar (EMPATHY_ROSTER_WINDOW (user_data)); } static void @@ -475,7 +491,7 @@ static void display_page_no_account (EmpathyRosterWindow *self) { display_page_message (self, - _("You need to setup an account to see contacts here."), + _("You need to set up an account to see contacts here."), PAGE_MESSAGE_FLAG_ACCOUNTS); } @@ -729,7 +745,7 @@ roster_window_error_display (EmpathyRosterWindow *self, tp_account_get_detailed_error (account, NULL))) { roster_window_error_add_stock_button (GTK_INFO_BAR (info_bar), - GTK_STOCK_REFRESH, _("Update software..."), + GTK_STOCK_REFRESH, _("Update software…"), ERROR_RESPONSE_RETRY); } else @@ -1257,19 +1273,43 @@ roster_window_favorite_chatroom_join (EmpathyChatroom *chatroom) } static void -roster_window_favorite_chatroom_menu_activate_cb (GAction *action, +roster_window_join_chatroom_menu_activate_cb (GSimpleAction *action, GVariant *parameter, - EmpathyChatroom *chatroom) + gpointer user_data) { + EmpathyRosterWindow *self = user_data; + const gchar *room, *path; + EmpathyClientFactory *factory; + TpAccount *account; + GError *error = NULL; + EmpathyChatroom *chatroom; + + g_variant_get (parameter, "(&s&s)", &room, &path); + + factory = empathy_client_factory_dup (); + + account = tp_simple_client_factory_ensure_account ( + TP_SIMPLE_CLIENT_FACTORY (factory), path, NULL, &error); + if (account == NULL) + { + DEBUG ("Failed to get account '%s': %s", path, error->message); + g_error_free (error); + goto out; + } + + chatroom = empathy_chatroom_manager_find (self->priv->chatroom_manager, + account, room); + if (chatroom == NULL) + { + DEBUG ("Failed to get chatroom '%s' on '%s'", + room, path); + goto out; + } + roster_window_favorite_chatroom_join (chatroom); -} -static gchar * -dup_join_action_name (EmpathyChatroom *chatroom, - gboolean prefix) -{ - return g_strconcat (prefix ? "win." : "", "join-", - empathy_chatroom_get_name (chatroom), NULL); +out: + g_object_unref (factory); } static void @@ -1277,35 +1317,26 @@ roster_window_favorite_chatroom_menu_add (EmpathyRosterWindow *self, EmpathyChatroom *chatroom) { GMenuItem *item; - const gchar *name, *account_name; - gchar *label, *action_name; - GAction *action; + const gchar *name, *account_name, *account_path; + TpAccount *account; + gchar *label; + + account = empathy_chatroom_get_account (chatroom); name = empathy_chatroom_get_name (chatroom); - account_name = tp_account_get_display_name ( - empathy_chatroom_get_account (chatroom)); + account_name = tp_account_get_display_name (account); + account_path = tp_proxy_get_object_path (account); label = g_strdup_printf ("%s (%s)", name, account_name); - action_name = dup_join_action_name (chatroom, FALSE); - - action = (GAction *) g_simple_action_new (action_name, NULL); - g_free (action_name); - - g_signal_connect (action, "activate", - G_CALLBACK (roster_window_favorite_chatroom_menu_activate_cb), - chatroom); - g_action_map_add_action (G_ACTION_MAP (self), action); - - action_name = dup_join_action_name (chatroom, TRUE); - - item = g_menu_item_new (label, action_name); + item = g_menu_item_new (label, NULL); + g_menu_item_set_action_and_target (item, "win.join", "(ss)", + name, account_path); g_menu_item_set_attribute (item, "room-name", "s", name); + g_menu_item_set_attribute (item, "account-path", "s", account_path); g_menu_append_item (self->priv->rooms_section, item); g_free (label); - g_free (action_name); - g_object_unref (action); } static void @@ -1323,26 +1354,46 @@ roster_window_favorite_chatroom_menu_removed_cb ( EmpathyRosterWindow *self) { GList *chatrooms; - gchar *act; - gint i; + guint i, n; + TpAccount *account; + const gchar *account_path; - act = dup_join_action_name (chatroom, TRUE); + account = empathy_chatroom_get_account (chatroom); + account_path = tp_proxy_get_object_path (account); - g_action_map_remove_action (G_ACTION_MAP (self), act); + n = g_menu_model_get_n_items (G_MENU_MODEL (self->priv->rooms_section)); - for (i = 0; i < g_menu_model_get_n_items ( - G_MENU_MODEL (self->priv->rooms_section)); i++) + for (i = 0; i < n; i++) { - const gchar *name; + gchar *tmp; + + if (!g_menu_model_get_item_attribute ( + G_MENU_MODEL (self->priv->rooms_section), i, + "room-name", "s", &tmp)) + continue; - if (g_menu_model_get_item_attribute ( - G_MENU_MODEL (self->priv->rooms_section), i, "room-name", - "s", &name) - && !tp_strdiff (name, empathy_chatroom_get_name (chatroom))) + if (tp_strdiff (tmp, empathy_chatroom_get_name (chatroom))) { - g_menu_remove (self->priv->rooms_section, i); - break; + g_free (tmp); + continue; } + + g_free (tmp); + + if (!g_menu_model_get_item_attribute ( + G_MENU_MODEL (self->priv->rooms_section), i, + "account-path", "s", &tmp)) + continue; + + if (tp_strdiff (tmp, account_path)) + { + g_free (tmp); + continue; + } + + g_menu_remove (self->priv->rooms_section, i); + g_free (tmp); + break; } chatrooms = empathy_chatroom_manager_get_chatrooms ( @@ -1674,7 +1725,7 @@ set_notebook_page (EmpathyRosterWindow *self) { if (g_settings_get_boolean (self->priv->gsettings_ui, EMPATHY_PREFS_UI_SHOW_OFFLINE)) - display_page_message (self, _("You haven't added any contact yet"), + display_page_message (self, _("You haven't added any contacts yet"), PAGE_MESSAGE_FLAG_ADD_CONTACT); else display_page_message (self, _("No online contacts"), @@ -1745,6 +1796,14 @@ account_disabled_cb (TpAccountManager *manager, set_notebook_page (self); } +static void +account_removed_cb (TpAccountManager *manager, + TpAccount *account, + EmpathyRosterWindow *self) +{ + set_notebook_page (self); +} + static void account_manager_prepared_cb (GObject *source_object, GAsyncResult *result, @@ -1773,6 +1832,8 @@ account_manager_prepared_cb (GObject *source_object, g_signal_connect (manager, "account-validity-changed", G_CALLBACK (roster_window_account_validity_changed_cb), self); + tp_g_signal_connect_object (manager, "account-removed", + G_CALLBACK (account_removed_cb), self, 0); tp_g_signal_connect_object (manager, "account-disabled", G_CALLBACK (account_disabled_cb), self, 0); tp_g_signal_connect_object (manager, "account-enabled", @@ -1830,6 +1891,7 @@ static GActionEntry menubar_entries[] = { { "room_join_new", roster_window_room_join_new_cb, NULL, NULL, NULL }, { "room_join_favorites", roster_window_room_join_favorites_cb, NULL, NULL, NULL }, + { "join", roster_window_join_chatroom_menu_activate_cb, "(ss)", NULL, NULL }, { "room_manage_favorites", roster_window_room_manage_favorites_cb, NULL, NULL, NULL }, { "help_contents", roster_window_help_contents_cb, NULL, NULL, NULL }, @@ -1937,8 +1999,18 @@ menu_deactivate_cb (GtkMenuShell *menushell, gtk_menu_detach (GTK_MENU (menushell)); } +static void +menu_item_activated_cb (GtkMenuShell *menushell, + gpointer user_data) +{ + EmpathyRosterWindow *roster_window = EMPATHY_ROSTER_WINDOW (user_data); + + hide_search_bar (roster_window); +} + static void popup_individual_menu_cb (EmpathyRosterView *view, + const gchar *active_group, FolksIndividual *individual, guint button, guint time, @@ -1955,7 +2027,8 @@ popup_individual_menu_cb (EmpathyRosterView *view, EMPATHY_INDIVIDUAL_FEATURE_REMOVE | EMPATHY_INDIVIDUAL_FEATURE_FILE_TRANSFER; - menu = empathy_individual_menu_new (individual, features, NULL); + menu = empathy_individual_menu_new (individual, active_group, + features, NULL); /* menu is initially unowned but gtk_menu_attach_to_widget() takes its * floating ref. We can either wait for the view to release its ref @@ -1965,6 +2038,8 @@ popup_individual_menu_cb (EmpathyRosterView *view, * during the whole lifetime of Empathy. */ g_signal_connect (menu, "deactivate", G_CALLBACK (menu_deactivate_cb), NULL); + g_signal_connect (menu, "menu-item-activated", + G_CALLBACK (menu_item_activated_cb), user_data); gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (view), NULL); gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, button, time); @@ -2099,22 +2174,22 @@ view_drag_motion_cb (GtkWidget *widget, { /* Check if contact supports FT */ FolksIndividual *individual; - GtkWidget *child; + GtkListBoxRow *row; individual = empathy_roster_view_get_individual_at_y (self->priv->view, - y, &child); + y, &row); if (individual == NULL) goto no_hl; if (!individual_supports_ft (individual)) goto no_hl; - egg_list_box_drag_highlight_widget (EGG_LIST_BOX (widget), child); + gtk_list_box_drag_highlight_row (GTK_LIST_BOX (widget), row); return FALSE; } no_hl: - egg_list_box_drag_unhighlight_widget (EGG_LIST_BOX (widget)); + gtk_list_box_drag_unhighlight_row (GTK_LIST_BOX (widget)); return FALSE; } @@ -2211,6 +2286,9 @@ empathy_roster_window_init (EmpathyRosterWindow *self) GtkWidget *sw; gchar *filename; GtkWidget *search_vbox; + GtkWidget *header_bar; + GtkWidget *new_conversation_button; + GtkWidget *image; guint i; EmpathyRosterModel *model; @@ -2233,7 +2311,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self) /* Set up interface */ filename = empathy_file_lookup ("empathy-roster-window.ui", "src"); - gui = empathy_builder_get_file (filename, + gui = tpaw_builder_get_file (filename, "main_vbox", &self->priv->main_vbox, "balance_vbox", &self->priv->balance_vbox, "errors_vbox", &self->priv->errors_vbox, @@ -2251,6 +2329,20 @@ empathy_roster_window_init (EmpathyRosterWindow *self) NULL); g_free (filename); + header_bar = gtk_header_bar_new (); + gtk_header_bar_set_title (GTK_HEADER_BAR(header_bar), _("Conversations")); + gtk_header_bar_set_show_close_button (GTK_HEADER_BAR(header_bar), TRUE); + + image = gtk_image_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON); + new_conversation_button = gtk_button_new (); + g_signal_connect (new_conversation_button, "clicked", + G_CALLBACK (roster_window_chat_new_message_cb), self); + gtk_button_set_image (GTK_BUTTON (new_conversation_button), image); + gtk_widget_set_tooltip_text (new_conversation_button, _("New Conversation")); + gtk_window_set_titlebar (GTK_WINDOW (self), header_bar); + gtk_container_add (GTK_CONTAINER (header_bar), new_conversation_button); + gtk_widget_show_all (header_bar); + gtk_container_add (GTK_CONTAINER (self), self->priv->main_vbox); gtk_widget_show (self->priv->main_vbox); @@ -2278,7 +2370,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self) roster_window_setup_actions (self); filename = empathy_file_lookup ("empathy-roster-window-menubar.ui", "src"); - gui = empathy_builder_get_file (filename, + gui = tpaw_builder_get_file (filename, "appmenu", &self->priv->menumodel, "rooms", &self->priv->rooms_section, NULL); @@ -2328,8 +2420,7 @@ empathy_roster_window_init (EmpathyRosterWindow *self) gtk_widget_show (GTK_WIDGET (self->priv->view)); - egg_list_box_add_to_scrolled (EGG_LIST_BOX (self->priv->view), - GTK_SCROLLED_WINDOW (sw)); + gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (self->priv->view)); g_signal_connect (self->priv->view, "individual-activated", G_CALLBACK (individual_activated_cb), self); @@ -2359,10 +2450,10 @@ empathy_roster_window_init (EmpathyRosterWindow *self) gtk_widget_set_has_tooltip (GTK_WIDGET (self->priv->view), TRUE); /* Set up search bar */ - self->priv->search_bar = empathy_live_search_new ( + self->priv->search_bar = tpaw_live_search_new ( GTK_WIDGET (self->priv->view)); empathy_roster_view_set_live_search (self->priv->view, - EMPATHY_LIVE_SEARCH (self->priv->search_bar)); + TPAW_LIVE_SEARCH (self->priv->search_bar)); gtk_box_pack_start (GTK_BOX (search_vbox), self->priv->search_bar, FALSE, TRUE, 0);