diff options
Diffstat (limited to 'src/empathy-chat-window.c')
| -rw-r--r-- | src/empathy-chat-window.c | 91 |
1 files changed, 74 insertions, 17 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index bb335033e..69469815e 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -23,6 +23,7 @@ * Martyn Russell <martyn@imendio.com> * Geert-Jan Van den Bogaerde <geertjan@gnome.org> * Xavier Claessens <xclaesse@gmail.com> + * Rômulo Fernandes Machado <romulo@castorgroup.net> */ #include <config.h> @@ -113,6 +114,8 @@ static const GtkTargetEntry drag_types_dest[] = { { "GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, DND_DRAG_TYPE_TAB }, }; +static void chat_window_update (EmpathyChatWindow *window); + G_DEFINE_TYPE (EmpathyChatWindow, empathy_chat_window, G_TYPE_OBJECT); static void @@ -295,6 +298,17 @@ chat_window_create_label (EmpathyChatWindow *window, } static void +_submenu_notify_visible_changed_cb (GObject *object, + GParamSpec *pspec, + gpointer userdata) +{ + g_signal_handlers_disconnect_by_func (object, + _submenu_notify_visible_changed_cb, + userdata); + chat_window_update (EMPATHY_CHAT_WINDOW (userdata)); +} + +static void chat_window_update (EmpathyChatWindow *window) { EmpathyChatWindowPriv *priv = GET_PRIV (window); @@ -311,8 +325,7 @@ chat_window_update (EmpathyChatWindow *window) gboolean avatar_in_icon; GtkWidget *chat; GtkWidget *chat_close_button; - GtkWidget *submenu; - GtkWidget *menu; + GtkWidget *menu, *submenu, *orig_submenu; /* Get information */ page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); @@ -326,8 +339,8 @@ chat_window_update (EmpathyChatWindow *window) DEBUG ("Update window"); /* Update menu */ - gtk_action_set_sensitive (priv->menu_tabs_next, !last_page); - gtk_action_set_sensitive (priv->menu_tabs_prev, !first_page); + gtk_action_set_sensitive (priv->menu_tabs_next, TRUE); + gtk_action_set_sensitive (priv->menu_tabs_prev, TRUE); gtk_action_set_sensitive (priv->menu_tabs_detach, num_pages > 1); gtk_action_set_sensitive (priv->menu_tabs_left, !first_page); gtk_action_set_sensitive (priv->menu_tabs_right, !last_page); @@ -336,9 +349,17 @@ chat_window_update (EmpathyChatWindow *window) /* Update Contact menu */ menu = gtk_ui_manager_get_widget (priv->ui_manager, "/chats_menubar/menu_contact"); - submenu = empathy_chat_get_contact_menu (priv->current_chat); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu); - gtk_widget_show (menu); + orig_submenu = gtk_menu_item_get_submenu (GTK_MENU_ITEM (menu)); + if (orig_submenu == NULL || !GTK_WIDGET_VISIBLE (orig_submenu)) { + submenu = empathy_chat_get_contact_menu (priv->current_chat); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu); + gtk_widget_show (menu); + } else { + empathy_signal_connect_weak (orig_submenu, + "notify::visible", + (GCallback)_submenu_notify_visible_changed_cb, + G_OBJECT (window)); + } /* Update window title */ if (n_chats == 1) { @@ -807,6 +828,50 @@ chat_window_paste_activate_cb (GtkAction *action, } static void +chat_window_tabs_next_activate_cb (GtkAction *action, + EmpathyChatWindow *window) +{ + EmpathyChatWindowPriv *priv; + EmpathyChat *chat; + gint index_, numPages; + + priv = GET_PRIV (window); + + chat = priv->current_chat; + index_ = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); + numPages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)); + + if (index_ == (numPages - 1)) { + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), 0); + return; + } + + gtk_notebook_next_page (GTK_NOTEBOOK (priv->notebook)); +} + +static void +chat_window_tabs_previous_activate_cb (GtkAction *action, + EmpathyChatWindow *window) +{ + EmpathyChatWindowPriv *priv; + EmpathyChat *chat; + gint index_, numPages; + + priv = GET_PRIV (window); + + chat = priv->current_chat; + index_ = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook)); + numPages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook)); + + if (index_ <= 0) { + gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), numPages - 1); + return; + } + + gtk_notebook_prev_page (GTK_NOTEBOOK (priv->notebook)); +} + +static void chat_window_tabs_left_activate_cb (GtkAction *action, EmpathyChatWindow *window) { @@ -1488,6 +1553,8 @@ empathy_chat_window_init (EmpathyChatWindow *window) "menu_edit_cut", "activate", chat_window_cut_activate_cb, "menu_edit_copy", "activate", chat_window_copy_activate_cb, "menu_edit_paste", "activate", chat_window_paste_activate_cb, + "menu_tabs_next", "activate", chat_window_tabs_next_activate_cb, + "menu_tabs_prev", "activate", chat_window_tabs_previous_activate_cb, "menu_tabs_left", "activate", chat_window_tabs_left_activate_cb, "menu_tabs_right", "activate", chat_window_tabs_right_activate_cb, "menu_tabs_detach", "activate", chat_window_detach_activate_cb, @@ -1542,16 +1609,6 @@ empathy_chat_window_init (EmpathyChatWindow *window) "delete_event", G_CALLBACK (chat_window_delete_event_cb), window); - - g_signal_connect_swapped (priv->menu_tabs_prev, - "activate", - G_CALLBACK (gtk_notebook_prev_page), - priv->notebook); - g_signal_connect_swapped (priv->menu_tabs_next, - "activate", - G_CALLBACK (gtk_notebook_next_page), - priv->notebook); - g_signal_connect (priv->dialog, "focus_in_event", G_CALLBACK (chat_window_focus_in_event_cb), |