*
* You should have received a copy of the GNU General Public
* License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ *
* Authors: Mikael Hallendal <micke@imendio.com>
* Richard Hult <richard@imendio.com>
* Martyn Russell <martyn@imendio.com>
#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-debug.h>
+#include <libempathy/empathy-dispatcher.h>
+#include <libempathy/empathy-chatroom-manager.h>
+#include <libempathy/empathy-account-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-sound.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include "empathy-chat-window.h"
#include "empathy-about-dialog.h"
+#include "empathy-misc.h"
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CHAT_WINDOW, EmpathyChatWindowPriv))
-
-#define DEBUG_DOMAIN "ChatWindow"
+#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
+#include <libempathy/empathy-debug.h>
-struct _EmpathyChatWindowPriv {
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatWindow)
+typedef struct {
EmpathyChat *current_chat;
GList *chats;
GList *chats_new_msg;
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_favorite;
+ GtkAction *menu_conv_toggle_contacts;
+
+ 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;
}
static void
-chat_window_close_button_style_set_cb (GtkWidget *button,
+chat_tab_style_set_cb (GtkWidget *hbox,
GtkStyle *previous_style,
gpointer user_data)
{
- gint h, w;
+ GtkWidget *button;
+ int char_width, h, w;
+ PangoContext *context;
+ PangoFontMetrics *metrics;
+
+ button = g_object_get_data (G_OBJECT (user_data),
+ "chat-window-tab-close-button");
+ context = gtk_widget_get_pango_context (hbox);
+
+ metrics = pango_context_get_metrics (context, gtk_widget_get_style (hbox)->font_desc,
+ pango_context_get_language (context));
+ char_width = pango_font_metrics_get_approximate_char_width (metrics);
+ pango_font_metrics_unref (metrics);
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button),
GTK_ICON_SIZE_MENU, &w, &h);
+ /* Request at least about 12 chars width plus at least space for the status
+ * image and the close button */
+ gtk_widget_set_size_request (hbox,
+ 12 * PANGO_PIXELS (char_width) + 2 * w, -1);
+
gtk_widget_set_size_request (button, w, h);
}
static GtkWidget *
chat_window_create_label (EmpathyChatWindow *window,
- EmpathyChat *chat)
+ EmpathyChat *chat,
+ gboolean is_tab_label)
{
EmpathyChatWindowPriv *priv;
GtkWidget *hbox;
gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
name_label = gtk_label_new (NULL);
- gtk_label_set_ellipsize (GTK_LABEL (name_label), PANGO_ELLIPSIZE_END);
+ if (is_tab_label)
+ gtk_label_set_ellipsize (GTK_LABEL (name_label), PANGO_ELLIPSIZE_END);
attr_list = pango_attr_list_new ();
attr = pango_attr_scale_new (1/1.2);
gtk_misc_set_padding (GTK_MISC (name_label), 2, 0);
gtk_misc_set_alignment (GTK_MISC (name_label), 0.0, 0.5);
- g_object_set_data (G_OBJECT (chat), "chat-window-tab-label", name_label);
+ g_object_set_data (G_OBJECT (chat),
+ is_tab_label ? "chat-window-tab-label" : "chat-window-menu-label",
+ name_label);
status_image = gtk_image_new ();
gtk_box_pack_start (GTK_BOX (event_box_hbox), status_image, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (event_box_hbox), name_label, TRUE, TRUE, 0);
- g_object_set_data (G_OBJECT (chat), "chat-window-tab-image", status_image);
- g_object_set_data (G_OBJECT (chat), "chat-window-tab-tooltip-widget", event_box);
+ g_object_set_data (G_OBJECT (chat),
+ is_tab_label ? "chat-window-tab-image" : "chat-window-menu-image",
+ status_image);
+ g_object_set_data (G_OBJECT (chat),
+ is_tab_label ? "chat-window-tab-tooltip-widget" : "chat-window-menu-tooltip-widget",
+ event_box);
- close_button = gtk_button_new ();
- gtk_button_set_relief (GTK_BUTTON (close_button), GTK_RELIEF_NONE);
+ gtk_container_add (GTK_CONTAINER (event_box), event_box_hbox);
+ gtk_box_pack_start (GTK_BOX (hbox), event_box, TRUE, TRUE, 0);
- /* We don't want focus/keynav for the button to avoid clutter, and
- * Ctrl-W works anyway.
- */
- GTK_WIDGET_UNSET_FLAGS (close_button, GTK_CAN_FOCUS);
- GTK_WIDGET_UNSET_FLAGS (close_button, GTK_CAN_DEFAULT);
+ if (is_tab_label) {
+ 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);
- /* Set the name to make the special rc style match. */
- gtk_widget_set_name (close_button, "empathy-close-button");
+ /* We don't want focus/keynav for the button to avoid clutter, and
+ * Ctrl-W works anyway.
+ */
+ GTK_WIDGET_UNSET_FLAGS (close_button, GTK_CAN_FOCUS);
+ GTK_WIDGET_UNSET_FLAGS (close_button, GTK_CAN_DEFAULT);
- close_image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
+ /* Set the name to make the special rc style match. */
+ gtk_widget_set_name (close_button, "empathy-close-button");
- gtk_container_add (GTK_CONTAINER (close_button), close_image);
+ close_image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU);
- gtk_container_add (GTK_CONTAINER (event_box), event_box_hbox);
- gtk_box_pack_start (GTK_BOX (hbox), event_box, TRUE, TRUE, 0);
- gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (close_button), close_image);
- /* React to theme changes and also used to setup the initial size
- * correctly.
- */
- g_signal_connect (close_button,
- "style-set",
- G_CALLBACK (chat_window_close_button_style_set_cb),
- chat);
+ gtk_box_pack_end (GTK_BOX (hbox), close_button, FALSE, FALSE, 0);
+
+ g_signal_connect (close_button,
+ "clicked",
+ G_CALLBACK (chat_window_close_clicked_cb),
+ chat);
- g_signal_connect (close_button,
- "clicked",
- G_CALLBACK (chat_window_close_clicked_cb),
- chat);
+ /* React to theme changes and also setup the size correctly. */
+ g_signal_connect (hbox,
+ "style-set",
+ G_CALLBACK (chat_tab_style_set_cb),
+ chat);
+ }
gtk_widget_show_all (hbox);
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;
+ GtkWidget *submenu;
+ GtkWidget *menu;
/* 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);
- empathy_debug (DEBUG_DOMAIN, "Update window");
+ 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 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);
/* 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);
+ }
}
}
+static void
+append_markup_printf (GString *string,
+ const char *format,
+ ...)
+{
+ gchar *tmp;
+ va_list args;
+
+ va_start (args, format);
+
+ tmp = g_markup_vprintf_escaped (format, args);
+ g_string_append (string, tmp);
+ g_free (tmp);
+
+ va_end (args);
+}
+
static void
chat_window_update_chat_tab (EmpathyChat *chat)
{
EmpathyChatWindowPriv *priv;
EmpathyContact *remote_contact;
const gchar *name;
+ const gchar *id;
+ EmpathyAccount *account;
const gchar *subject;
+ const gchar *status = NULL;
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);
- empathy_debug (DEBUG_DOMAIN, "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, empathy_account_get_unique_name (account), subject, remote_contact);
/* Update tab image */
if (g_list_find (priv->chats_new_msg, chat)) {
}
widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-image");
gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name, GTK_ICON_SIZE_MENU);
+ widget = g_object_get_data (G_OBJECT (chat), "chat-window-menu-image");
+ gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name, GTK_ICON_SIZE_MENU);
/* 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));
+ id = empathy_contact_get_id (remote_contact);
+ status = empathy_contact_get_presence_message (remote_contact);
+ } else {
+ id = name;
}
- else {
- g_string_append (tooltip, name);
+
+ append_markup_printf (tooltip,
+ "<b>%s</b><small> (%s)</small>",
+ id,
+ empathy_account_get_display_name (account));
+
+ if (!EMP_STR_EMPTY (status)) {
+ append_markup_printf (tooltip, "\n<i>%s</i>", status);
}
+
if (subject) {
- g_string_append_printf (tooltip, "\n%s %s", _("Topic:"), subject);
+ append_markup_printf (tooltip, "\n<b>%s</b> %s",
+ _("Topic:"), subject);
}
+
if (g_list_find (priv->chats_composing, chat)) {
- g_string_append_printf (tooltip, "\n%s", _("Typing a message."));
+ append_markup_printf (tooltip, "\n%s", _("Typing a message."));
}
- 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);
+ widget = g_object_get_data (G_OBJECT (chat), "chat-window-menu-tooltip-widget");
+ gtk_widget_set_tooltip_markup (widget, markup);
+ g_free (markup);
- /* Update tab label */
+ /* Update tab and menu label */
widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
gtk_label_set_text (GTK_LABEL (widget), name);
+ widget = g_object_get_data (G_OBJECT (chat), "chat-window-menu-label");
+ gtk_label_set_text (GTK_LABEL (widget), name);
/* Update the window if it's the current chat */
if (priv->current_chat == chat) {
}
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_clear_activate_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
+chat_window_conv_activate_cb (GtkAction *action,
+ EmpathyChatWindow *window)
{
- EmpathyChatWindowPriv *priv;
+ EmpathyChatWindowPriv *priv = GET_PRIV (window);
+ gboolean is_room;
+ gboolean active;
+ EmpathyContact *remote_contact = NULL;
+
+ /* Favorite room menu */
+ is_room = empathy_chat_is_room (priv->current_chat);
+ if (is_room) {
+ const gchar *room;
+ EmpathyAccount *account;
+ gboolean found = FALSE;
+ EmpathyChatroom *chatroom;
+
+ room = empathy_chat_get_id (priv->current_chat);
+ account = empathy_chat_get_account (priv->current_chat);
+ chatroom = empathy_chatroom_manager_find (priv->chatroom_manager,
+ account, room);
+ if (chatroom != NULL)
+ found = empathy_chatroom_is_favorite (chatroom);
+
+ 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);
+
+ /* Show contacts menu */
+ g_object_get (priv->current_chat,
+ "remote-contact", &remote_contact,
+ "show-contacts", &active,
+ NULL);
+ if (remote_contact == NULL) {
+ gtk_toggle_action_set_active (
+ GTK_TOGGLE_ACTION (priv->menu_conv_toggle_contacts),
+ active);
+ }
+ gtk_action_set_visible (priv->menu_conv_toggle_contacts,
+ (remote_contact == NULL));
+ if (remote_contact != NULL) {
+ g_object_unref (remote_contact);
+ }
+}
- priv = GET_PRIV (window);
+static void
+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;
+ EmpathyAccount *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 (chatroom == NULL) {
+ 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);
+ }
+
+ empathy_chatroom_set_favorite (chatroom, active);
+}
+
+static void
+chat_window_contacts_toggled_cb (GtkToggleAction *toggle_action,
+ EmpathyChatWindow *window)
+{
+ EmpathyChatWindowPriv *priv = GET_PRIV (window);
+ gboolean active;
+
+ active = gtk_toggle_action_get_active (toggle_action);
+
+ empathy_chat_set_show_contacts (priv->current_chat, active);
+}
+
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);
GdkEvent *event,
EmpathyChatWindow *window)
{
- EmpathyChatWindowPriv *priv;
- GList *list;
- GList *l;
-
- priv = GET_PRIV (window);
-
- empathy_debug (DEBUG_DOMAIN, "Delete event received");
+ EmpathyChatWindowPriv *priv = GET_PRIV (window);
- list = g_list_copy (priv->chats);
+ DEBUG ("Delete event received");
- for (l = list; l; l = l->next) {
- empathy_chat_window_remove_chat (window, l->data);
+ g_object_ref (window);
+ while (priv->chats) {
+ empathy_chat_window_remove_chat (window, priv->chats->data);
}
-
- g_list_free (list);
+ g_object_unref (window);
return TRUE;
}
priv = GET_PRIV (window);
- empathy_debug (DEBUG_DOMAIN, "Turning %s urgency hint",
- urgent ? "on" : "off");
+ DEBUG ("Turning %s urgency hint", urgent ? "on" : "off");
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;
+ const gchar *header;
+ char *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 = 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);
+ /* if icon doesn't exist libnotify will crash */
+ if (pixbuf != 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);
+ /* if icon doesn't exist libnotify will crash */
+ if (pixbuf != NULL)
+ 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 (escaped);
+}
+
+static void
+chat_window_set_highlight_room_tab_label (EmpathyChat *chat)
+{
+ gchar *markup;
+ GtkWidget *widget;
+
+ if (empathy_chat_is_room (chat) == FALSE)
+ return;
+
+ markup = g_markup_printf_escaped ("<span color=\"%s\">%s</span>",
+ "red",
+ empathy_chat_get_name (chat));
+
+ widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
+ gtk_label_set_markup (GTK_LABEL (widget), markup);
+ g_free (markup);
+}
+
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
+ * preferences 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)) {
+ empathy_sound_play (GTK_WIDGET (priv->dialog),
+ EMPATHY_SOUND_MESSAGE_OUTGOING);
+ }
+
if (has_focus && priv->current_chat == chat) {
return;
}
-
- if (empathy_chat_get_members_count (chat) > 2) {
+
+ if (!g_list_find (priv->chats_new_msg, chat)) {
+ priv->chats_new_msg = g_list_prepend (priv->chats_new_msg, chat);
+ chat_window_update_chat_tab (chat);
+ }
+
+ /* 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;
}
- if (needs_urgency && !has_focus) {
- chat_window_set_urgency_hint (window, TRUE);
- }
+ if (needs_urgency) {
+ if (!has_focus) {
+ chat_window_set_urgency_hint (window, TRUE);
+ chat_window_set_highlight_room_tab_label (chat);
+ }
- if (!g_list_find (priv->chats_new_msg, chat)) {
- priv->chats_new_msg = g_list_prepend (priv->chats_new_msg, chat);
- chat_window_update_chat_tab (chat);
+ empathy_sound_play (GTK_WIDGET (priv->dialog),
+ EMPATHY_SOUND_MESSAGE_INCOMING);
+ chat_window_show_or_update_notification (window, message, chat);
}
}
new_window = empathy_chat_window_new ();
priv = GET_PRIV (new_window);
- empathy_debug (DEBUG_DOMAIN, "Detach hook called");
+ DEBUG ("Detach hook called");
empathy_chat_window_move_chat (window, new_window, chat);
EmpathyChat *chat;
GtkWidget *child;
- empathy_debug (DEBUG_DOMAIN, "Page switched");
+ DEBUG ("Page switched");
priv = GET_PRIV (window);
* it, so we return here and in "page-added".
*/
if (priv->dnd_same_window) {
- empathy_debug (DEBUG_DOMAIN, "Page added (back to the same window)");
+ DEBUG ("Page added (back to the same window)");
priv->dnd_same_window = FALSE;
return;
}
- empathy_debug (DEBUG_DOMAIN, "Page added");
+ DEBUG ("Page added");
/* Get chat object */
chat = EMPATHY_CHAT (child);
* it, so we return here and in "page-added".
*/
if (priv->dnd_same_window) {
- empathy_debug (DEBUG_DOMAIN, "Page removed (and will be readded to same window)");
+ DEBUG ("Page removed (and will be readded to same window)");
return;
}
- empathy_debug (DEBUG_DOMAIN, "Page removed");
+ DEBUG ("Page removed");
/* Get chat object */
chat = EMPATHY_CHAT (child);
{
EmpathyChatWindowPriv *priv;
- empathy_debug (DEBUG_DOMAIN, "Focus in event, updating title");
+ DEBUG ("Focus in event, updating title");
priv = GET_PRIV (window);
priv->chats_new_msg = g_list_remove (priv->chats_new_msg, priv->current_chat);
chat_window_set_urgency_hint (window, FALSE);
-
+
/* Update the title, since we now mark all unread messages as read. */
chat_window_update_chat_tab (priv->current_chat);
if (info == DND_DRAG_TYPE_CONTACT_ID) {
EmpathyChat *chat;
EmpathyChatWindow *old_window;
- McAccount *account;
+ EmpathyAccount *account;
+ EmpathyAccountManager *account_manager;
const gchar *id;
gchar **strv;
+ const gchar *account_id;
+ const gchar *contact_id;
- id = (const gchar*) selection->data;
+ id = (const gchar*) gtk_selection_data_get_data (selection);
+ account_manager = empathy_account_manager_dup_singleton ();
+
+ DEBUG ("DND contact from roster with id:'%s'", id);
- empathy_debug (DEBUG_DOMAIN, "DND contact from roster with id:'%s'", id);
-
strv = g_strsplit (id, "/", 2);
- account = mc_account_lookup (strv[0]);
- chat = empathy_chat_window_find_chat (account, strv[1]);
+ account_id = strv[0];
+ contact_id = strv[1];
+ account = empathy_account_manager_lookup (account_manager, account_id);
+ chat = empathy_chat_window_find_chat (account, contact_id);
if (!chat) {
- empathy_chat_with_contact_id (account, strv[2]);
+ TpConnection *connection;
+
+ connection = empathy_account_get_connection (account);
+
+ if (connection) {
+ empathy_dispatcher_chat_with_contact_id (
+ connection, contact_id, NULL, NULL);
+ }
+
g_object_unref (account);
g_strfreev (strv);
return;
}
g_object_unref (account);
+ g_object_unref (account_manager);
g_strfreev (strv);
- old_window = chat_window_find_chat (chat);
+ old_window = chat_window_find_chat (chat);
if (old_window) {
if (old_window == window) {
gtk_drag_finish (context, TRUE, FALSE, time);
return;
}
-
+
empathy_chat_window_move_chat (old_window, window, chat);
} else {
empathy_chat_window_add_chat (window, chat);
}
-
+
/* Added to take care of any outstanding chat events */
empathy_chat_window_present_chat (chat);
/* 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().
+ * anyway with add_chat () and remove_chat ().
*/
gtk_drag_finish (context, TRUE, FALSE, time);
}
EmpathyChat **chat;
EmpathyChatWindow *old_window = NULL;
- empathy_debug (DEBUG_DOMAIN, "DND tab");
+ DEBUG ("DND tab");
- chat = (void*) selection->data;
+ chat = (void *) gtk_selection_data_get_data (selection);
old_window = chat_window_find_chat (*chat);
if (old_window) {
priv = GET_PRIV (window);
if (old_window == window) {
- empathy_debug (DEBUG_DOMAIN, "DND tab (within same 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;
}
/* 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().
+ * anyway with add_chat () and remove_chat ().
*/
gtk_drag_finish (context, TRUE, FALSE, time);
} else {
- empathy_debug (DEBUG_DOMAIN, "DND from unknown source");
+ DEBUG ("DND from unknown source");
gtk_drag_finish (context, FALSE, FALSE, time);
}
}
window = EMPATHY_CHAT_WINDOW (object);
priv = GET_PRIV (window);
- empathy_debug (DEBUG_DOMAIN, "Finalized: %p", object);
+ 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)
{
- EmpathyChatWindowPriv *priv;
- GladeXML *glade;
- GtkAccelGroup *accel_group;
- GClosure *closure;
- GtkWidget *menu_conv;
- GtkWidget *menu;
- gint i;
- GtkWidget *chat_vbox;
- gchar *filename;
-
- priv = GET_PRIV (window);
-
- filename = empathy_file_lookup ("empathy-chat-window.glade", "src");
- glade = empathy_glade_get_file (filename,
- "chat_window",
- NULL,
+ GtkBuilder *gui;
+ GtkAccelGroup *accel_group;
+ GClosure *closure;
+ 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.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_conv_toggle_contacts", &priv->menu_conv_toggle_contacts,
"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_toggle_contacts", "toggled", chat_window_contacts_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");
+ gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow");
+ gtk_notebook_set_scrollable (GTK_NOTEBOOK (priv->notebook), TRUE);
+ gtk_notebook_popup_enable (GTK_NOTEBOOK (priv->notebook));
gtk_box_pack_start (GTK_BOX (chat_vbox), priv->notebook, TRUE, TRUE, 0);
gtk_widget_show (priv->notebook);
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;
}
{
EmpathyChatWindowPriv *priv;
GtkWidget *label;
+ GtkWidget *popup_label;
GtkWidget *child;
gint x, y, w, h;
/* Reference the chat object */
g_object_ref (chat);
- empathy_geometry_load (chat_get_window_id_for_geometry (chat), &x, &y, &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 (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 (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);
- label = chat_window_create_label (window, chat);
+ label = chat_window_create_label (window, chat, TRUE);
+ popup_label = chat_window_create_label (window, chat, FALSE);
gtk_widget_show (child);
g_signal_connect (chat, "notify::name",
NULL);
chat_window_chat_notify_cb (chat);
- gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), child, label);
+ 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);
+ TRUE, TRUE, GTK_PACK_START);
- empathy_debug (DEBUG_DOMAIN,
- "Chat added (%d references)",
- G_OBJECT (chat)->ref_count);
+ DEBUG ("Chat added (%d references)", G_OBJECT (chat)->ref_count);
}
void
GTK_WIDGET (chat));
gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), position);
- empathy_debug (DEBUG_DOMAIN,
- "Chat removed (%d references)",
- G_OBJECT (chat)->ref_count - 1);
+ DEBUG ("Chat removed (%d references)", G_OBJECT (chat)->ref_count - 1);
g_object_unref (chat);
}
widget = GTK_WIDGET (chat);
- empathy_debug (DEBUG_DOMAIN,
- "Chat moving with widget:%p (%d references)",
- widget,
- G_OBJECT (widget)->ref_count);
+ DEBUG ("Chat moving with widget:%p (%d references)", widget,
+ G_OBJECT (widget)->ref_count);
/* We reference here to make sure we don't loose the widget
* and the EmpathyChat object during the move.
}
EmpathyChat *
-empathy_chat_window_find_chat (McAccount *account,
+empathy_chat_window_find_chat (EmpathyAccount *account,
const gchar *id)
{
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;
empathy_chat_window_switch_to_chat (window, chat);
empathy_window_present (GTK_WINDOW (priv->dialog), TRUE);
- gtk_widget_grab_focus (chat->input_text_view);
+ 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