#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#include <glade/glade.h>
#include <glib/gi18n.h>
+#include <libnotify/notification.h>
#include <telepathy-glib/util.h>
#include <libmissioncontrol/mission-control.h>
-#include <libempathy/empathy-contact-factory.h>
#include <libempathy/empathy-contact.h>
#include <libempathy/empathy-message.h>
#include <libempathy/empathy-dispatcher.h>
+#include <libempathy/empathy-chatroom-manager.h>
#include <libempathy/empathy-utils.h>
#include <libempathy-gtk/empathy-images.h>
#include <libempathy-gtk/empathy-contact-dialogs.h>
#include <libempathy-gtk/empathy-log-window.h>
#include <libempathy-gtk/empathy-geometry.h>
+#include <libempathy-gtk/empathy-smiley-manager.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include "empathy-chat-window.h"
#include "empathy-about-dialog.h"
+#include "empathy-misc.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
#include <libempathy/empathy-debug.h>
gboolean page_added;
gboolean dnd_same_window;
guint save_geometry_id;
+ EmpathyChatroomManager *chatroom_manager;
GtkWidget *dialog;
GtkWidget *notebook;
+ NotifyNotification *notification;
/* Menu items. */
- GtkWidget *menu_conv_clear;
- GtkWidget *menu_conv_insert_smiley;
- GtkWidget *menu_conv_contact;
- GtkWidget *menu_conv_close;
-
- GtkWidget *menu_edit_cut;
- GtkWidget *menu_edit_copy;
- GtkWidget *menu_edit_paste;
-
- GtkWidget *menu_tabs_next;
- GtkWidget *menu_tabs_prev;
- GtkWidget *menu_tabs_left;
- GtkWidget *menu_tabs_right;
- GtkWidget *menu_tabs_detach;
-
- GtkWidget *menu_help_contents;
- GtkWidget *menu_help_about;
+ GtkUIManager *ui_manager;
+ GtkAction *menu_conv_insert_smiley;
+ GtkAction *menu_conv_contact;
+ GtkAction *menu_conv_favorite;
+
+ GtkAction *menu_edit_cut;
+ GtkAction *menu_edit_copy;
+ GtkAction *menu_edit_paste;
+
+ GtkAction *menu_tabs_next;
+ GtkAction *menu_tabs_prev;
+ GtkAction *menu_tabs_left;
+ GtkAction *menu_tabs_right;
+ GtkAction *menu_tabs_detach;
} EmpathyChatWindowPriv;
static GList *chat_windows = NULL;
}
static void
-chat_window_close_clicked_cb (GtkWidget *button,
+chat_window_close_clicked_cb (GtkAction *action,
EmpathyChat *chat)
{
EmpathyChatWindow *window;
close_button = gtk_button_new ();
gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
+ g_object_set_data (G_OBJECT (chat), "chat-window-tab-close-button", close_button);
/* We don't want focus/keynav for the button to avoid clutter, and
* Ctrl-W works anyway.
return hbox;
}
-static const gchar *
-chat_window_get_chat_name (EmpathyChat *chat)
-{
- EmpathyContact *remote_contact = NULL;
- const gchar *name = NULL;
-
- name = empathy_chat_get_name (chat);
- if (!name) {
- remote_contact = empathy_chat_get_remote_contact (chat);
- if (remote_contact) {
- name = empathy_contact_get_name (remote_contact);
- }
- }
-
- return name ? name : _("Conversation");
-}
-
static void
chat_window_update (EmpathyChatWindow *window)
{
gboolean is_connected;
gint num_pages;
gint page_num;
+ gint i;
const gchar *name;
guint n_chats;
+ GdkPixbuf *icon;
+ EmpathyContact *remote_contact;
+ gboolean avatar_in_icon;
+ GtkWidget *chat;
+ GtkWidget *chat_close_button;
/* Get information */
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
first_page = (page_num == 0);
last_page = (page_num == (num_pages - 1));
is_connected = empathy_chat_get_tp_chat (priv->current_chat) != NULL;
- name = chat_window_get_chat_name (priv->current_chat);
+ name = empathy_chat_get_name (priv->current_chat);
n_chats = g_list_length (priv->chats);
DEBUG ("Update window");
/* Update menu */
- gtk_widget_set_sensitive (priv->menu_tabs_next, !last_page);
- gtk_widget_set_sensitive (priv->menu_tabs_prev, !first_page);
- gtk_widget_set_sensitive (priv->menu_tabs_detach, num_pages > 1);
- gtk_widget_set_sensitive (priv->menu_tabs_left, !first_page);
- gtk_widget_set_sensitive (priv->menu_tabs_right, !last_page);
- gtk_widget_set_sensitive (priv->menu_conv_insert_smiley, is_connected);
+ 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_detach, num_pages > 1);
+ gtk_action_set_sensitive (priv->menu_tabs_left, !first_page);
+ gtk_action_set_sensitive (priv->menu_tabs_right, !last_page);
+ gtk_action_set_sensitive (priv->menu_conv_insert_smiley, is_connected);
/* Update window title */
if (n_chats == 1) {
gtk_window_set_icon_name (GTK_WINDOW (priv->dialog),
EMPATHY_IMAGE_MESSAGE);
} else {
- gtk_window_set_icon_name (GTK_WINDOW (priv->dialog), NULL);
+ empathy_conf_get_bool (empathy_conf_get (),
+ EMPATHY_PREFS_CHAT_AVATAR_IN_ICON,
+ &avatar_in_icon);
+
+ if (n_chats == 1 && avatar_in_icon) {
+ remote_contact = empathy_chat_get_remote_contact (priv->current_chat);
+ icon = empathy_pixbuf_avatar_from_contact_scaled (remote_contact, 0, 0);
+ gtk_window_set_icon (GTK_WINDOW (priv->dialog), icon);
+
+ if (icon != NULL) {
+ g_object_unref (icon);
+ }
+ } else {
+ gtk_window_set_icon_name (GTK_WINDOW (priv->dialog), NULL);
+ }
+ }
+
+ if (num_pages == 1) {
+ chat = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), 0);
+ chat_close_button = g_object_get_data (G_OBJECT (chat),
+ "chat-window-tab-close-button");
+ gtk_widget_hide (chat_close_button);
+ } else {
+ for (i=0; i<num_pages; i++) {
+ chat = gtk_notebook_get_nth_page (GTK_NOTEBOOK (priv->notebook), i);
+ chat_close_button = g_object_get_data (G_OBJECT (chat),
+ "chat-window-tab-close-button");
+ gtk_widget_show (chat_close_button);
+ }
}
}
EmpathyChatWindowPriv *priv;
EmpathyContact *remote_contact;
const gchar *name;
+ McAccount *account;
const gchar *subject;
GtkWidget *widget;
GString *tooltip;
- gchar *str;
+ gchar *markup;
const gchar *icon_name;
window = chat_window_find_chat (chat);
priv = GET_PRIV (window);
/* Get information */
- name = chat_window_get_chat_name (chat);
+ name = empathy_chat_get_name (chat);
+ account = empathy_chat_get_account (chat);
subject = empathy_chat_get_subject (chat);
remote_contact = empathy_chat_get_remote_contact (chat);
- DEBUG ("Updating chat tab, name=%s, subject=%s, remote_contact=%p",
- name, subject, remote_contact);
+ DEBUG ("Updating chat tab, name=%s, account=%s, subject=%s, remote_contact=%p",
+ name, mc_account_get_unique_name (account), subject, remote_contact);
/* Update tab image */
if (g_list_find (priv->chats_new_msg, chat)) {
/* Update tab tooltip */
tooltip = g_string_new (NULL);
+
if (remote_contact) {
- g_string_append_printf (tooltip, "%s\n%s",
- empathy_contact_get_id (remote_contact),
- empathy_contact_get_status (remote_contact));
+ markup = g_markup_printf_escaped ("<b>%s</b><small> (%s)</small>\n%s",
+ empathy_contact_get_id (remote_contact),
+ mc_account_get_display_name (account),
+ empathy_contact_get_status (remote_contact));
+ g_string_append (tooltip, markup);
+ g_free (markup);
}
else {
- g_string_append (tooltip, name);
+ markup = g_markup_printf_escaped ("<b>%s</b><small> (%s)</small>", name,
+ mc_account_get_display_name (account));
+ g_string_append (tooltip, markup);
+ g_free (markup);
}
+
if (subject) {
- g_string_append_printf (tooltip, "\n%s %s", _("Topic:"), subject);
+ markup = g_markup_printf_escaped ("\n<b>%s</b> %s", _("Topic:"), subject);
+ g_string_append (tooltip, markup);
+ g_free (markup);
}
if (g_list_find (priv->chats_composing, chat)) {
- g_string_append_printf (tooltip, "\n%s", _("Typing a message."));
+ markup = g_markup_printf_escaped ("\n%s", _("Typing a message."));
+ g_string_append (tooltip, markup);
+ g_free (markup);
}
- str = g_string_free (tooltip, FALSE);
+
+ markup = g_string_free (tooltip, FALSE);
widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-tooltip-widget");
- gtk_widget_set_tooltip_text (widget, str);
- g_free (str);
+ gtk_widget_set_tooltip_markup (widget, markup);
+ g_free (markup);
/* Update tab label */
widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
}
static void
-chat_window_insert_smiley_activate_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
+chat_window_insert_smiley_activate_cb (EmpathySmileyManager *manager,
+ EmpathySmiley *smiley,
+ gpointer window)
{
- EmpathyChatWindowPriv *priv;
+ EmpathyChatWindowPriv *priv = GET_PRIV (window);
EmpathyChat *chat;
- GtkTextBuffer *buffer;
- GtkTextIter iter;
- const gchar *smiley;
-
- priv = GET_PRIV (window);
+ GtkTextBuffer *buffer;
+ GtkTextIter iter;
chat = priv->current_chat;
- smiley = g_object_get_data (G_OBJECT (menuitem), "smiley_text");
-
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, -1);
+ gtk_text_buffer_insert (buffer, &iter, smiley->str, -1);
}
static void
-chat_window_conv_activate_cb (GtkWidget *menuitem,
+chat_window_conv_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv = GET_PRIV (window);
+ GtkWidget *menu = NULL;
GtkWidget *submenu = NULL;
+ gboolean is_room;
+ /* Contact submenu */
submenu = empathy_chat_get_contact_menu (priv->current_chat);
if (submenu) {
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (priv->menu_conv_contact),
- submenu);
- gtk_widget_show (priv->menu_conv_contact);
+ menu = gtk_ui_manager_get_widget (priv->ui_manager,
+ "/chats_menubar/menu_conv/menu_conv_contact");
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
gtk_widget_show (submenu);
- } else {
- gtk_widget_hide (priv->menu_conv_contact);
}
+ gtk_action_set_visible (priv->menu_conv_contact, submenu != NULL);
+
+ /* Favorite room menu */
+ is_room = empathy_chat_is_room (priv->current_chat);
+ if (is_room) {
+ const gchar *room;
+ McAccount *account;
+ gboolean found;
+
+ room = empathy_chat_get_id (priv->current_chat);
+ account = empathy_chat_get_account (priv->current_chat);
+ found = empathy_chatroom_manager_find (priv->chatroom_manager,
+ account, room) != NULL;
+
+ DEBUG ("This room %s favorite", found ? "is" : "is not");
+ gtk_toggle_action_set_active (
+ GTK_TOGGLE_ACTION (priv->menu_conv_favorite), found);
+ }
+ gtk_action_set_visible (priv->menu_conv_favorite, is_room);
}
static void
-chat_window_clear_activate_cb (GtkWidget *menuitem,
+chat_window_clear_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv = GET_PRIV (window);
empathy_chat_clear (priv->current_chat);
}
+static void
+chat_window_favorite_toggled_cb (GtkToggleAction *toggle_action,
+ EmpathyChatWindow *window)
+{
+ EmpathyChatWindowPriv *priv = GET_PRIV (window);
+ gboolean active;
+ McAccount *account;
+ const gchar *room;
+ EmpathyChatroom *chatroom;
+
+ active = gtk_toggle_action_get_active (toggle_action);
+ account = empathy_chat_get_account (priv->current_chat);
+ room = empathy_chat_get_id (priv->current_chat);
+
+ chatroom = empathy_chatroom_manager_find (priv->chatroom_manager,
+ account, room);
+
+ if (active && !chatroom) {
+ const gchar *name;
+
+ name = empathy_chat_get_name (priv->current_chat);
+ chatroom = empathy_chatroom_new_full (account, room, name, FALSE);
+ empathy_chatroom_manager_add (priv->chatroom_manager, chatroom);
+ g_object_unref (chatroom);
+ return;
+ }
+
+ if (!active && chatroom) {
+ empathy_chatroom_manager_remove (priv->chatroom_manager, chatroom);
+ }
+}
+
static const gchar *
chat_get_window_id_for_geometry (EmpathyChat *chat)
{
}
static void
-chat_window_close_activate_cb (GtkWidget *menuitem,
+chat_window_close_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
}
static void
-chat_window_edit_activate_cb (GtkWidget *menuitem,
+chat_window_edit_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
g_return_if_fail (priv->current_chat != NULL);
if (!empathy_chat_get_tp_chat (priv->current_chat)) {
- gtk_widget_set_sensitive (priv->menu_edit_copy, FALSE);
- gtk_widget_set_sensitive (priv->menu_edit_cut, FALSE);
- gtk_widget_set_sensitive (priv->menu_edit_paste, FALSE);
+ gtk_action_set_sensitive (priv->menu_edit_copy, FALSE);
+ gtk_action_set_sensitive (priv->menu_edit_cut, FALSE);
+ gtk_action_set_sensitive (priv->menu_edit_paste, FALSE);
return;
}
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->current_chat->input_text_view));
- if (gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL)) {
- gtk_widget_set_sensitive (priv->menu_edit_copy, TRUE);
- gtk_widget_set_sensitive (priv->menu_edit_cut, TRUE);
+ if (gtk_text_buffer_get_has_selection (buffer)) {
+ gtk_action_set_sensitive (priv->menu_edit_copy, TRUE);
+ gtk_action_set_sensitive (priv->menu_edit_cut, TRUE);
} else {
gboolean selection;
- selection = empathy_chat_view_get_selection_bounds (priv->current_chat->view,
- NULL, NULL);
+ selection = empathy_chat_view_get_has_selection (priv->current_chat->view);
- gtk_widget_set_sensitive (priv->menu_edit_cut, FALSE);
- gtk_widget_set_sensitive (priv->menu_edit_copy, selection);
+ gtk_action_set_sensitive (priv->menu_edit_cut, FALSE);
+ gtk_action_set_sensitive (priv->menu_edit_copy, selection);
}
clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
text_available = gtk_clipboard_wait_is_text_available (clipboard);
- gtk_widget_set_sensitive (priv->menu_edit_paste, text_available);
+ gtk_action_set_sensitive (priv->menu_edit_paste, text_available);
}
static void
-chat_window_cut_activate_cb (GtkWidget *menuitem,
+chat_window_cut_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
}
static void
-chat_window_copy_activate_cb (GtkWidget *menuitem,
+chat_window_copy_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
}
static void
-chat_window_paste_activate_cb (GtkWidget *menuitem,
+chat_window_paste_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
}
static void
-chat_window_tabs_left_activate_cb (GtkWidget *menuitem,
+chat_window_tabs_left_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
}
static void
-chat_window_tabs_right_activate_cb (GtkWidget *menuitem,
+chat_window_tabs_right_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
}
static void
-chat_window_detach_activate_cb (GtkWidget *menuitem,
+chat_window_detach_activate_cb (GtkAction *action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
}
static void
-chat_window_help_contents_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
+chat_window_help_contents_activate_cb (GtkAction *action,
+ EmpathyChatWindow *window)
{
- empathy_url_show ("ghelp:empathy?chat");
+ EmpathyChatWindowPriv *priv = GET_PRIV (window);
+
+ empathy_url_show (priv->dialog, "ghelp:empathy?chat");
}
static void
-chat_window_help_about_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
+chat_window_help_about_activate_cb (GtkAction *action,
+ EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv = GET_PRIV (window);
gtk_window_set_urgency_hint (GTK_WINDOW (priv->dialog), urgent);
}
+typedef struct {
+ EmpathyChatWindow *window;
+ EmpathyChat *chat;
+} NotificationData;
+
+static void
+chat_window_notification_closed_cb (NotifyNotification *notify,
+ NotificationData *cb_data)
+{
+ EmpathyNotificationClosedReason reason = 0;
+ EmpathyChatWindowPriv *priv = GET_PRIV (cb_data->window);
+
+#ifdef notify_notification_get_closed_reason
+ reason = notify_notification_get_closed_reason (notify);
+#endif
+ if (reason == EMPATHY_NOTIFICATION_CLOSED_DISMISSED) {
+ empathy_chat_window_present_chat (cb_data->chat);
+ }
+
+ g_object_unref (notify);
+ priv->notification = NULL;
+ g_object_unref (cb_data->chat);
+ g_slice_free (NotificationData, cb_data);
+}
+
+static void
+chat_window_show_or_update_notification (EmpathyChatWindow *window,
+ EmpathyMessage *message,
+ EmpathyChat *chat)
+{
+ EmpathyContact *sender;
+ char *header, *escaped;
+ const char *body;
+ GdkPixbuf *pixbuf;
+ NotificationData *cb_data;
+ EmpathyChatWindowPriv *priv = GET_PRIV (window);
+ gboolean res;
+
+ if (!empathy_notification_is_enabled ()) {
+ return;
+ } else {
+ empathy_conf_get_bool (empathy_conf_get (),
+ EMPATHY_PREFS_NOTIFICATIONS_FOCUS, &res);
+ if (!res) {
+ return;
+ }
+ }
+
+ cb_data = g_slice_new0 (NotificationData);
+ cb_data->chat = g_object_ref (chat);
+ cb_data->window = window;
+
+ sender = empathy_message_get_sender (message);
+ header = g_strdup_printf (_("New message from %s"),
+ empathy_contact_get_name (sender));
+ body = empathy_message_get_body (message);
+ escaped = g_markup_escape_text (body, -1);
+
+ pixbuf = empathy_misc_get_pixbuf_for_notification (sender, EMPATHY_IMAGE_NEW_MESSAGE);
+
+ if (priv->notification != NULL) {
+ notify_notification_update (priv->notification,
+ header, escaped, NULL);
+ notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
+ } else {
+ priv->notification = notify_notification_new (header, escaped, NULL, NULL);
+ notify_notification_set_timeout (priv->notification, NOTIFY_EXPIRES_DEFAULT);
+ notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
+
+ g_signal_connect (priv->notification, "closed",
+ G_CALLBACK (chat_window_notification_closed_cb), cb_data);
+ }
+
+ notify_notification_show (priv->notification, NULL);
+
+ g_object_unref (pixbuf);
+ g_free (header);
+ g_free (escaped);
+}
+
static void
chat_window_new_message_cb (EmpathyChat *chat,
EmpathyMessage *message,
EmpathyChatWindowPriv *priv;
gboolean has_focus;
gboolean needs_urgency;
+ EmpathyContact *sender;
priv = GET_PRIV (window);
has_focus = empathy_chat_window_has_focus (window);
+ /* - if we're the sender, we play the sound if it's specified in the
+ * preferences and we're not away.
+ * - if we receive a message, we play the sound if it's specified in the
+ * prefereces and the window does not have focus on the chat receiving
+ * the message.
+ */
+
+ sender = empathy_message_get_sender (message);
+
+ if (empathy_contact_is_user (sender) != FALSE) {
+ empathy_sound_play (GTK_WIDGET (priv->dialog),
+ EMPATHY_SOUND_MESSAGE_OUTGOING);
+ } else {
+ if ((!has_focus || priv->current_chat != chat)) {
+ empathy_sound_play (GTK_WIDGET (priv->dialog),
+ EMPATHY_SOUND_MESSAGE_INCOMING);
+ }
+ }
+
+ if (!has_focus) {
+ chat_window_show_or_update_notification (window, message, chat);
+ }
+
if (has_focus && priv->current_chat == chat) {
return;
}
-
- if (empathy_chat_get_members_count (chat) > 2) {
+
+ /* If empathy_chat_is_room() returns TRUE, that means it's a named MUC.
+ * If empathy_chat_get_remote_contact() returns NULL, that means it's
+ * an unamed MUC (msn-like).
+ * In case of a MUC, we set urgency only if the message contains our
+ * alias. */
+ if (empathy_chat_is_room (chat) ||
+ empathy_chat_get_remote_contact (chat) == NULL) {
needs_urgency = empathy_message_should_highlight (message);
} else {
needs_urgency = TRUE;
chat = empathy_chat_window_find_chat (account, strv[1]);
if (!chat) {
- empathy_dispatcher_chat_with_contact_id (account, strv[2]);
+ empathy_dispatcher_chat_with_contact_id (account, strv[2], NULL, NULL);
g_object_unref (account);
g_strfreev (strv);
return;
DEBUG ("Finalized: %p", object);
+ g_object_unref (priv->ui_manager);
+ g_object_unref (priv->chatroom_manager);
if (priv->save_geometry_id != 0) {
g_source_remove (priv->save_geometry_id);
}
+ if (priv->notification != NULL) {
+ notify_notification_close (priv->notification, NULL);
+ g_object_unref (priv->notification);
+ priv->notification = NULL;
+ }
+
chat_windows = g_list_remove (chat_windows, window);
gtk_widget_destroy (priv->dialog);
static void
empathy_chat_window_init (EmpathyChatWindow *window)
{
- GladeXML *glade;
+ GtkBuilder *gui;
GtkAccelGroup *accel_group;
GClosure *closure;
- GtkWidget *menu_conv;
GtkWidget *menu;
+ GtkWidget *submenu;
gint i;
GtkWidget *chat_vbox;
gchar *filename;
+ EmpathySmileyManager *smiley_manager;
EmpathyChatWindowPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (window,
EMPATHY_TYPE_CHAT_WINDOW, EmpathyChatWindowPriv);
window->priv = priv;
- filename = empathy_file_lookup ("empathy-chat-window.glade", "src");
- glade = empathy_glade_get_file (filename,
- "chat_window",
- NULL,
+ filename = empathy_file_lookup ("empathy-chat-window.ui", "src");
+ gui = empathy_builder_get_file (filename,
"chat_window", &priv->dialog,
"chat_vbox", &chat_vbox,
- "menu_conv", &menu_conv,
- "menu_conv_clear", &priv->menu_conv_clear,
+ "ui_manager", &priv->ui_manager,
"menu_conv_insert_smiley", &priv->menu_conv_insert_smiley,
"menu_conv_contact", &priv->menu_conv_contact,
- "menu_conv_close", &priv->menu_conv_close,
+ "menu_conv_favorite", &priv->menu_conv_favorite,
"menu_edit_cut", &priv->menu_edit_cut,
"menu_edit_copy", &priv->menu_edit_copy,
"menu_edit_paste", &priv->menu_edit_paste,
"menu_tabs_left", &priv->menu_tabs_left,
"menu_tabs_right", &priv->menu_tabs_right,
"menu_tabs_detach", &priv->menu_tabs_detach,
- "menu_help_contents", &priv->menu_help_contents,
- "menu_help_about", &priv->menu_help_about,
NULL);
g_free (filename);
- empathy_glade_connect (glade,
- window,
+ empathy_builder_connect (gui, window,
"chat_window", "configure-event", chat_window_configure_event_cb,
"menu_conv", "activate", chat_window_conv_activate_cb,
"menu_conv_clear", "activate", chat_window_clear_activate_cb,
+ "menu_conv_favorite", "toggled", chat_window_favorite_toggled_cb,
"menu_conv_close", "activate", chat_window_close_activate_cb,
"menu_edit", "activate", chat_window_edit_activate_cb,
"menu_edit_cut", "activate", chat_window_cut_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,
- "menu_help_contents", "activate", chat_window_help_contents_cb,
- "menu_help_about", "activate", chat_window_help_about_cb,
+ "menu_help_contents", "activate", chat_window_help_contents_activate_cb,
+ "menu_help_about", "activate", chat_window_help_about_activate_cb,
NULL);
- g_object_unref (glade);
+ g_object_ref (priv->ui_manager);
+ g_object_unref (gui);
+
+ priv->chatroom_manager = empathy_chatroom_manager_dup_singleton (NULL);
priv->notebook = gtk_notebook_new ();
gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow");
g_object_unref (accel_group);
/* Set up smiley menu */
- menu = empathy_chat_view_get_smiley_menu (
- G_CALLBACK (chat_window_insert_smiley_activate_cb),
- window);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (priv->menu_conv_insert_smiley), menu);
-
- /* Set up signals we can't do with glade since we may need to
+ smiley_manager = empathy_smiley_manager_dup_singleton ();
+ submenu = empathy_smiley_menu_new (smiley_manager,
+ chat_window_insert_smiley_activate_cb,
+ window);
+ menu = gtk_ui_manager_get_widget (priv->ui_manager,
+ "/chats_menubar/menu_conv/menu_conv_insert_smiley");
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu), submenu);
+ g_object_unref (smiley_manager);
+
+ /* Set up signals we can't do with ui file since we may need to
* block/unblock them at some later stage.
*/
chat_window = l->data;
dialog = empathy_chat_window_get_dialog (chat_window);
- if (empathy_window_get_is_visible (GTK_WINDOW (GTK_WINDOW (dialog)))) {
+ if (empathy_window_get_is_visible (GTK_WINDOW (dialog))) {
/* Found a visible window on this desktop */
return chat_window;
}
/* Reference the chat object */
g_object_ref (chat);
- empathy_geometry_load (chat_get_window_id_for_geometry (chat), &x, &y, &w, &h);
-
- if (x >= 0 && y >= 0) {
- /* Let the window manager position it if we don't have
- * good x, y coordinates.
- */
- gtk_window_move (GTK_WINDOW (priv->dialog), x, y);
- }
-
- if (w > 0 && h > 0) {
- /* Use the defaults from the glade file if we don't have
- * good w, h geometry.
- */
- gtk_window_resize (GTK_WINDOW (priv->dialog), w, h);
+ /* If this window has just been created, position it */
+ if (priv->chats == NULL) {
+ empathy_geometry_load (chat_get_window_id_for_geometry (chat), &x, &y, &w, &h);
+
+ if (x >= 0 && y >= 0) {
+ /* Let the window manager position it if we don't have
+ * good x, y coordinates.
+ */
+ gtk_window_move (GTK_WINDOW (priv->dialog), x, y);
+ }
+
+ if (w > 0 && h > 0) {
+ /* Use the defaults from the ui file if we don't have
+ * good w, h geometry.
+ */
+ gtk_window_resize (GTK_WINDOW (priv->dialog), w, h);
+ }
}
child = GTK_WIDGET (chat);
GList *l;
g_return_val_if_fail (MC_IS_ACCOUNT (account), NULL);
- g_return_val_if_fail (!G_STR_EMPTY (id), NULL);
+ g_return_val_if_fail (!EMP_STR_EMPTY (id), NULL);
for (l = chat_windows; l; l = l->next) {
EmpathyChatWindowPriv *priv;
gtk_widget_grab_focus (chat->input_text_view);
}
-#if 0
-static gboolean
-chat_window_should_play_sound (EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv = GET_PRIV (window);
- gboolean has_focus = FALSE;
-
- g_return_val_if_fail (EMPATHY_IS_CHAT_WINDOW (window), FALSE);
-
- g_object_get (priv->dialog, "has-toplevel-focus", &has_focus, NULL);
-
- return !has_focus;
-}
-#endif
projects / empathy.git / blobdiff