Updated Polish translation

[empathy.git] / src / empathy-chat-window.c

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 6b0dc5d00db971192667e6a43aed51c13e3d6c4e..96484172c42e2b7c0c09478b3fe5f86e177d2e07 100644 (file)
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -93,6 +93,7 @@ typedef struct {
        GtkAction   *menu_edit_cut;
        GtkAction   *menu_edit_copy;
        GtkAction   *menu_edit_paste;
+       GtkAction   *menu_edit_find;
 
        GtkAction   *menu_tabs_next;
        GtkAction   *menu_tabs_prev;
@@ -874,6 +875,7 @@ chat_window_invite_participant_activate_cb (GtkAction         *action,
        EmpathyTpChat         *tp_chat;
        TpChannel             *channel;
        int                    response;
+       TpAccount             *account;
 
        priv = GET_PRIV (window);
 
@@ -881,11 +883,10 @@ chat_window_invite_participant_activate_cb (GtkAction         *action,
 
        tp_chat = empathy_chat_get_tp_chat (priv->current_chat);
        channel = empathy_tp_chat_get_channel (tp_chat);
+       account = empathy_chat_get_account (priv->current_chat);
 
-       /* FIXME: should filter out the existing participants from the
-        * list */
        dialog = empathy_invite_participant_dialog_new (
-                       GTK_WINDOW (priv->dialog));
+                       GTK_WINDOW (priv->dialog), account);
        gtk_widget_show (dialog);
 
        response = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -1002,6 +1003,19 @@ chat_window_paste_activate_cb (GtkAction         *action,
        empathy_chat_paste (priv->current_chat);
 }
 
+static void
+chat_window_find_activate_cb (GtkAction         *action,
+                             EmpathyChatWindow *window)
+{
+       EmpathyChatWindowPriv *priv;
+
+       g_return_if_fail (EMPATHY_IS_CHAT_WINDOW (window));
+
+       priv = GET_PRIV (window);
+
+       empathy_chat_find (priv->current_chat);
+}
+
 static void
 chat_window_tabs_next_activate_cb (GtkAction         *action,
                                   EmpathyChatWindow *window)
@@ -1303,6 +1317,8 @@ chat_window_new_message_cb (EmpathyChat       *chat,
 
        if (has_focus && priv->current_chat == chat) {
                /* window and tab are focused so consider the message to be read */
+
+               /* FIXME: see Bug#610994 and coments about it in EmpathyChatPriv */
                empathy_chat_messages_read (chat);
                return;
        }
@@ -1517,6 +1533,28 @@ chat_window_focus_in_event_cb (GtkWidget        *widget,
        return FALSE;
 }
 
+static gboolean
+chat_window_drag_drop (GtkWidget        *widget,
+                        GdkDragContext   *context,
+                        int               x,
+                        int               y,
+                        guint             time_,
+                        gpointer          user_data)
+{
+       GdkAtom target, uri_target, contact_target;
+
+       target = gtk_drag_dest_find_target (widget, context, NULL);
+       uri_target = gdk_atom_intern_static_string ("text/uri-list");
+       contact_target = gdk_atom_intern_static_string ("text/contact-id");
+
+       if (target == uri_target || target == contact_target) {
+               gtk_drag_get_data (widget, context, target, time_);
+               return TRUE;
+       }
+
+       return FALSE;
+}
+
 static gboolean
 chat_window_drag_motion (GtkWidget        *widget,
                         GdkDragContext   *context,
@@ -1574,9 +1612,7 @@ chat_window_drag_motion (GtkWidget        *widget,
                return TRUE;
        }
 
-       /* Otherwise, it must be a notebook tab drag.  Set to MOVE. */
-       gdk_drag_status (context, GDK_ACTION_MOVE, time_);
-       return TRUE;
+       return FALSE;
 }
 
 static void
@@ -1695,23 +1731,10 @@ chat_window_drag_data_received (GtkWidget        *widget,
                        EmpathyChatWindowPriv *priv;
 
                        priv = GET_PRIV (window);
-
-                       if (old_window == window) {
-                               DEBUG ("DND tab (within same window)");
-                               priv->dnd_same_window = TRUE;
-                               gtk_drag_finish (context, TRUE, FALSE, time_);
-                               return;
-                       }
-
-                       priv->dnd_same_window = FALSE;
+                       priv->dnd_same_window = (old_window == window);
+                       DEBUG ("DND tab (within same window: %s)",
+                               priv->dnd_same_window ? "Yes" : "No");
                }
-
-               /* We should return TRUE to remove the data when doing
-                * GDK_ACTION_MOVE, but we don't here otherwise it has
-                * weird consequences, and we handle that internally
-                * anyway with add_chat () and remove_chat ().
-                */
-               gtk_drag_finish (context, TRUE, FALSE, time_);
        } else {
                DEBUG ("DND from unknown source");
                gtk_drag_finish (context, FALSE, FALSE, time_);
@@ -1806,6 +1829,7 @@ empathy_chat_window_init (EmpathyChatWindow *window)
                                       "menu_edit_cut", &priv->menu_edit_cut,
                                       "menu_edit_copy", &priv->menu_edit_copy,
                                       "menu_edit_paste", &priv->menu_edit_paste,
+                                      "menu_edit_find", &priv->menu_edit_find,
                                       "menu_tabs_next", &priv->menu_tabs_next,
                                       "menu_tabs_prev", &priv->menu_tabs_prev,
                                       "menu_tabs_left", &priv->menu_tabs_left,
@@ -1825,6 +1849,7 @@ 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_edit_find", "activate", chat_window_find_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,
@@ -1906,7 +1931,7 @@ empathy_chat_window_init (EmpathyChatWindow *window)
 
        /* Set up drag and drop */
        gtk_drag_dest_set (GTK_WIDGET (priv->notebook),
-                          GTK_DEST_DEFAULT_ALL,
+                          GTK_DEST_DEFAULT_HIGHLIGHT,
                           drag_types_dest,
                           G_N_ELEMENTS (drag_types_dest),
                           GDK_ACTION_MOVE | GDK_ACTION_COPY);
@@ -1920,6 +1945,10 @@ empathy_chat_window_init (EmpathyChatWindow *window)
                          "drag-data-received",
                          G_CALLBACK (chat_window_drag_data_received),
                          window);
+       g_signal_connect (priv->notebook,
+                         "drag-drop",
+                         G_CALLBACK (chat_window_drag_drop),
+                         window);
 
        chat_windows = g_list_prepend (chat_windows, window);
 
@@ -2006,6 +2035,7 @@ empathy_chat_window_add_chat (EmpathyChatWindow *window,
        GtkWidget             *label;
        GtkWidget             *popup_label;
        GtkWidget             *child;
+       GValue                value = { 0, };
 
        g_return_if_fail (window != NULL);
        g_return_if_fail (EMPATHY_IS_CHAT (chat));
@@ -2053,8 +2083,13 @@ empathy_chat_window_add_chat (EmpathyChatWindow *window,
        gtk_notebook_append_page_menu (GTK_NOTEBOOK (priv->notebook), child, label, popup_label);
        gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (priv->notebook), child, TRUE);
        gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (priv->notebook), child, TRUE);
-       gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK (priv->notebook), child,
-                                           TRUE, TRUE, GTK_PACK_START);
+       g_value_init (&value, G_TYPE_BOOLEAN);
+       g_value_set_boolean (&value, TRUE);
+       gtk_container_child_set_property (GTK_CONTAINER (priv->notebook),
+                                         child, "tab-expand" , &value);
+       gtk_container_child_set_property (GTK_CONTAINER (priv->notebook),
+                                         child,  "tab-fill" , &value);
+       g_value_unset (&value);
 
        DEBUG ("Chat added (%d references)", G_OBJECT (chat)->ref_count);
 }
@@ -2207,7 +2242,7 @@ empathy_chat_window_present_chat (EmpathyChat *chat)
 
        priv = GET_PRIV (window);
        empathy_chat_window_switch_to_chat (window, chat);
-       empathy_window_present (GTK_WINDOW (priv->dialog), TRUE);
+       empathy_window_present (GTK_WINDOW (priv->dialog));
 
        gtk_widget_grab_focus (chat->input_text_view);
 }