empathy r846 - in trunk: libempathy-gtk src
- From: xclaesse svn gnome org
- To: svn-commits-list gnome org
- Subject: empathy r846 - in trunk: libempathy-gtk src
- Date: Wed, 2 Apr 2008 10:42:04 +0100 (BST)
Author: xclaesse
Date: Wed Apr 2 10:42:04 2008
New Revision: 846
URL: http://svn.gnome.org/viewvc/empathy?rev=846&view=rev
Log:
Fix build errors EmpathyChatWindow, port to new API.
Modified:
trunk/libempathy-gtk/empathy-chat.c
trunk/libempathy-gtk/empathy-chat.h
trunk/src/empathy-chat-window.c
trunk/src/empathy-chat-window.glade
trunk/src/empathy-chat-window.h
Modified: trunk/libempathy-gtk/empathy-chat.c
==============================================================================
--- trunk/libempathy-gtk/empathy-chat.c (original)
+++ trunk/libempathy-gtk/empathy-chat.c Wed Apr 2 10:42:04 2008
@@ -61,11 +61,9 @@
struct _EmpathyChatPriv {
EmpathyTpChat *tp_chat;
McAccount *account;
+ gchar *id;
gchar *name;
gchar *subject;
- gchar *tooltip;
- EmpathyContact *selected_contact;
- gchar *id;
EmpathyLogManager *log_manager;
MissionControl *mc;
@@ -110,11 +108,9 @@
PROP_0,
PROP_TP_CHAT,
PROP_ACCOUNT,
+ PROP_ID,
PROP_NAME,
PROP_SUBJECT,
- PROP_TOOLTIP,
- PROP_SELECTED_CONTACT,
- PROP_ID
};
static guint signals[LAST_SIGNAL] = { 0 };
@@ -139,18 +135,12 @@
case PROP_NAME:
g_value_set_string (value, priv->name);
break;
- case PROP_SUBJECT:
- g_value_set_string (value, priv->subject);
- break;
- case PROP_TOOLTIP:
- g_value_set_string (value, priv->tooltip);
- break;
- case PROP_SELECTED_CONTACT:
- g_value_set_object (value, priv->selected_contact);
- break;
case PROP_ID:
g_value_set_string (value, priv->id);
break;
+ case PROP_SUBJECT:
+ g_value_set_string (value, priv->subject);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
@@ -596,61 +586,7 @@
g_free (priv->name);
priv->name = g_value_dup_string (value);
g_object_notify (G_OBJECT (chat), "name");
- } else {
- return;
}
-
- g_free (priv->tooltip);
- priv->tooltip = g_strconcat (priv->name, "\n",
- _("Topic: "), priv->subject, NULL);
- g_object_notify (G_OBJECT (chat), "tooltip");
-}
-
-static void
-chat_selected_contact_notify_cb (EmpathyChat *chat)
-{
- EmpathyChatPriv *priv = GET_PRIV (chat);
-
- g_free (priv->name);
- priv->name = g_strdup (empathy_contact_get_name (priv->selected_contact));
- g_object_notify (G_OBJECT (chat), "name");
-
- g_free (priv->tooltip);
- priv->tooltip = g_strconcat (empathy_contact_get_id (priv->selected_contact),
- "\n",
- empathy_contact_get_status (priv->selected_contact),
- NULL);
- g_object_notify (G_OBJECT (chat), "tooltip");
-}
-
-static void
-chat_remote_contact_notify_cb (EmpathyChat *chat)
-{
- EmpathyChatPriv *priv = GET_PRIV (chat);
- EmpathyContact *contact;
-
- contact = empathy_tp_chat_get_remote_contact (priv->tp_chat);
- if (contact == priv->selected_contact) {
- return;
- }
-
- if (priv->selected_contact) {
- g_signal_handlers_disconnect_by_func (contact,
- chat_selected_contact_notify_cb,
- chat);
- g_object_unref (priv->selected_contact);
- priv->selected_contact = NULL;
- }
-
- if (contact) {
- priv->selected_contact = g_object_ref (contact);
- g_signal_connect_swapped (contact, "notify",
- G_CALLBACK (chat_selected_contact_notify_cb),
- chat);
- chat_selected_contact_notify_cb (chat);
- }
-
- g_object_notify (G_OBJECT (chat), "selected-contact");
}
static gboolean
@@ -1367,13 +1303,6 @@
g_object_unref (priv->account);
}
- if (priv->selected_contact) {
- g_signal_handlers_disconnect_by_func (priv->selected_contact,
- chat_selected_contact_notify_cb,
- chat);
- g_object_unref (priv->selected_contact);
- }
-
if (priv->block_events_timeout_id) {
g_source_remove (priv->block_events_timeout_id);
}
@@ -1381,7 +1310,6 @@
g_free (priv->id);
g_free (priv->name);
g_free (priv->subject);
- g_free (priv->tooltip);
G_OBJECT_CLASS (empathy_chat_parent_class)->finalize (object);
}
@@ -1420,6 +1348,13 @@
MC_TYPE_ACCOUNT,
G_PARAM_READABLE));
g_object_class_install_property (object_class,
+ PROP_ID,
+ g_param_spec_string ("id",
+ "Chat's id",
+ "The id of the chat",
+ NULL,
+ G_PARAM_READABLE));
+ g_object_class_install_property (object_class,
PROP_NAME,
g_param_spec_string ("name",
"Chat's name",
@@ -1433,29 +1368,6 @@
"The subject or topic of the chat",
NULL,
G_PARAM_READABLE));
- g_object_class_install_property (object_class,
- PROP_TOOLTIP,
- g_param_spec_string ("tooltip",
- "Chat's tooltip",
- "The tooltip of the chat",
- NULL,
- G_PARAM_READABLE));
- g_object_class_install_property (object_class,
- PROP_SELECTED_CONTACT,
- g_param_spec_object ("selected-contact",
- "The selected contact",
- "The selected contact, "
- "either the remote contact or "
- "the one selected on the contact list",
- EMPATHY_TYPE_CONTACT,
- G_PARAM_READABLE));
- g_object_class_install_property (object_class,
- PROP_ID,
- g_param_spec_string ("id",
- "Chat's id",
- "The id of the chat",
- NULL,
- G_PARAM_READABLE));
signals[COMPOSING] =
g_signal_new ("composing",
@@ -1592,7 +1504,6 @@
priv->account = g_object_ref (empathy_tp_chat_get_account (tp_chat));
tp_chan = empathy_tp_chat_get_channel (tp_chat);
priv->handle_type = tp_chan->handle_type;
- chat_remote_contact_notify_cb (chat);
g_signal_connect (tp_chat, "message-received",
G_CALLBACK (chat_message_received_cb),
@@ -1606,9 +1517,6 @@
g_signal_connect (tp_chat, "property-changed",
G_CALLBACK (chat_property_changed_cb),
chat);
- g_signal_connect_swapped (tp_chat, "notify::remote-contact",
- G_CALLBACK (chat_remote_contact_notify_cb),
- chat);
g_signal_connect (tp_chat, "destroy",
G_CALLBACK (chat_destroy_cb),
chat);
@@ -1639,53 +1547,33 @@
}
const gchar *
-empathy_chat_get_name (EmpathyChat *chat)
-{
- EmpathyChatPriv *priv = GET_PRIV (chat);
-
- g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
-
- return priv->name;
-}
-
-const gchar *
-empathy_chat_get_subject (EmpathyChat *chat)
+empathy_chat_get_id (EmpathyChat *chat)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
- return priv->subject;
+ return priv->id;
}
const gchar *
-empathy_chat_get_tooltip (EmpathyChat *chat)
-{
- EmpathyChatPriv *priv = GET_PRIV (chat);
-
- g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
-
- return priv->tooltip;
-}
-
-EmpathyContact *
-empathy_chat_get_selected_contact (EmpathyChat *chat)
+empathy_chat_get_name (EmpathyChat *chat)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
- return priv->selected_contact;
+ return priv->name;
}
const gchar *
-empathy_chat_get_id (EmpathyChat *chat)
+empathy_chat_get_subject (EmpathyChat *chat)
{
EmpathyChatPriv *priv = GET_PRIV (chat);
g_return_val_if_fail (EMPATHY_IS_CHAT (chat), NULL);
- return priv->id;
+ return priv->subject;
}
void
Modified: trunk/libempathy-gtk/empathy-chat.h
==============================================================================
--- trunk/libempathy-gtk/empathy-chat.h (original)
+++ trunk/libempathy-gtk/empathy-chat.h Wed Apr 2 10:42:04 2008
@@ -67,11 +67,9 @@
void empathy_chat_set_tp_chat (EmpathyChat *chat,
EmpathyTpChat *tp_chat);
McAccount * empathy_chat_get_account (EmpathyChat *chat);
+const gchar * empathy_chat_get_id (EmpathyChat *chat);
const gchar * empathy_chat_get_name (EmpathyChat *chat);
const gchar * empathy_chat_get_subject (EmpathyChat *chat);
-const gchar * empathy_chat_get_tooltip (EmpathyChat *chat);
-EmpathyContact * empathy_chat_get_selected_contact (EmpathyChat *chat);
-const gchar * empathy_chat_get_id (EmpathyChat *chat);
void empathy_chat_clear (EmpathyChat *chat);
void empathy_chat_scroll_down (EmpathyChat *chat);
void empathy_chat_cut (EmpathyChat *chat);
Modified: trunk/src/empathy-chat-window.c
==============================================================================
--- trunk/src/empathy-chat-window.c (original)
+++ trunk/src/empathy-chat-window.c Wed Apr 2 10:42:04 2008
@@ -37,22 +37,19 @@
#include <libmissioncontrol/mission-control.h>
#include <libempathy/empathy-contact-factory.h>
-#include <libempathy/empathy-log-manager.h>
-#include <libempathy/empathy-chatroom-manager.h>
#include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-debug.h>
#include <libempathy/empathy-message.h>
+#include <libempathy/empathy-debug.h>
#include <libempathy/empathy-utils.h>
#include <libempathy-gtk/empathy-images.h>
#include <libempathy-gtk/empathy-conf.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-ui-utils.h>
#include "empathy-chat-window.h"
-#include "empathy-new-chatroom-dialog.h"
-#include "empathy-preferences.h"
#include "empathy-about-dialog.h"
#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CHAT_WINDOW, EmpathyChatWindowPriv))
@@ -60,47 +57,34 @@
#define DEBUG_DOMAIN "ChatWindow"
struct _EmpathyChatWindowPriv {
- EmpathyChatroomManager *chatroom_manager;
- GList *chats;
- GList *chats_new_msg;
- GList *chats_composing;
- EmpathyChat *current_chat;
- gboolean page_added;
- gboolean dnd_same_window;
- guint save_geometry_id;
- GtkWidget *dialog;
- GtkWidget *notebook;
+ EmpathyChat *current_chat;
+ GList *chats;
+ GList *chats_new_msg;
+ GList *chats_composing;
+ gboolean page_added;
+ gboolean dnd_same_window;
+ guint save_geometry_id;
+ GtkWidget *dialog;
+ GtkWidget *notebook;
/* Menu items. */
- GtkWidget *menu_conv_clear;
- GtkWidget *menu_conv_insert_smiley;
- GtkWidget *menu_conv_call;
- GtkWidget *menu_conv_call_separator;
- GtkWidget *menu_conv_log;
- GtkWidget *menu_conv_separator;
- GtkWidget *menu_conv_add_contact;
- GtkWidget *menu_conv_info;
- GtkWidget *menu_conv_close;
-
- GtkWidget *menu_room;
- GtkWidget *menu_room_set_topic;
- GtkWidget *menu_room_join_new;
- GtkWidget *menu_room_invite;
- GtkWidget *menu_room_add;
- GtkWidget *menu_room_show_contacts;
-
- 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_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;
+ GtkWidget *menu_help_contents;
+ GtkWidget *menu_help_about;
};
static void empathy_chat_window_class_init (EmpathyChatWindowClass *klass);
@@ -191,30 +175,6 @@
gtk_widget_set_size_request (button, w, h);
}
-static void
-chat_window_update_tooltip (EmpathyChatWindow *window,
- EmpathyChat *chat)
-{
- EmpathyChatWindowPriv *priv;
- GtkWidget *widget;
- const gchar *tooltip;
- gchar *str = NULL;
-
- priv = GET_PRIV (window);
-
- tooltip = empathy_chat_get_tooltip (chat);
-
- if (g_list_find (priv->chats_composing, chat)) {
- str = g_strconcat (tooltip, "\n", _("Typing a message."), NULL);
- tooltip = str;
- }
-
- widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-tooltip-widget");
- gtk_widget_set_tooltip_text (widget, tooltip);
-
- g_free (str);
-}
-
static GtkWidget *
chat_window_create_label (EmpathyChatWindow *window,
EmpathyChat *chat)
@@ -238,7 +198,7 @@
event_box = gtk_event_box_new ();
gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
- name_label = gtk_label_new (empathy_chat_get_name (chat));
+ name_label = gtk_label_new (NULL);
gtk_label_set_ellipsize (GTK_LABEL (name_label), PANGO_ELLIPSIZE_END);
attr_list = pango_attr_list_new ();
@@ -297,27 +257,62 @@
G_CALLBACK (chat_window_close_clicked_cb),
chat);
- /* Set up tooltip */
- chat_window_update_tooltip (window, chat);
-
gtk_widget_show_all (hbox);
return hbox;
}
static void
-chat_window_update_title (EmpathyChatWindow *window,
- EmpathyChat *chat)
+chat_window_update_menu (EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
- gint n_chats;
-
+ gboolean first_page;
+ gboolean last_page;
+ gboolean is_connected;
+ gint num_pages;
+ gint page_num;
+
priv = GET_PRIV (window);
-
+
+ /* Notebook pages */
+ page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
+ num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook));
+ first_page = (page_num == 0);
+ last_page = (page_num == (num_pages - 1));
+
+ 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);
+
+ is_connected = empathy_chat_get_tp_chat (priv->current_chat) != NULL;
+ gtk_widget_set_sensitive (priv->menu_conv_insert_smiley, is_connected);
+}
+
+static void
+chat_window_update_title (EmpathyChatWindow *window)
+{
+ EmpathyChatWindowPriv *priv = GET_PRIV (window);
+ EmpathyTpChat *tp_chat;
+ EmpathyContact *remote_contact;
+ const gchar *name;
+ guint n_chats;
+
+ /* Get chat's name */
+ name = empathy_chat_get_name (priv->current_chat);
+ tp_chat = empathy_chat_get_tp_chat (priv->current_chat);
+ if (!name && tp_chat) {
+ remote_contact = empathy_tp_chat_get_remote_contact (tp_chat);
+ if (remote_contact) {
+ name = empathy_contact_get_name (remote_contact);
+ }
+ }
+
+ /* Update window title */
n_chats = g_list_length (priv->chats);
if (n_chats == 1) {
- gtk_window_set_title (GTK_WINDOW (priv->dialog),
- empathy_chat_get_name (priv->current_chat));
+ gtk_window_set_title (GTK_WINDOW (priv->dialog), name);
} else {
gchar *title;
@@ -325,7 +320,6 @@
gtk_window_set_title (GTK_WINDOW (priv->dialog), title);
g_free (title);
}
-
if (priv->chats_new_msg) {
gtk_window_set_icon_name (GTK_WINDOW (priv->dialog),
EMPATHY_IMAGE_MESSAGE);
@@ -335,131 +329,170 @@
}
static void
-chat_window_update_status (EmpathyChatWindow *window,
- EmpathyChat *chat)
+chat_window_update_chat (EmpathyChat *chat)
{
+ EmpathyChatWindow *window;
EmpathyChatWindowPriv *priv;
- GtkImage *image;
- const gchar *icon_name = NULL;
+ EmpathyTpChat *tp_chat;
+ EmpathyContact *remote_contact = NULL;
+ const gchar *name;
+ const gchar *subject;
+ GtkWidget *widget;
+ GString *tooltip;
+ gchar *str;
+ const gchar *icon_name;
+ window = chat_window_find_chat (chat);
priv = GET_PRIV (window);
+ /* Get information */
+ name = empathy_chat_get_name (chat);
+ subject = empathy_chat_get_subject (chat);
+ tp_chat = empathy_chat_get_tp_chat (chat);
+ if (tp_chat) {
+ remote_contact = empathy_tp_chat_get_remote_contact (tp_chat);
+ }
+ if (!name && remote_contact) {
+ name = empathy_contact_get_name (remote_contact);
+ }
+
+ /* Update tab image */
if (g_list_find (priv->chats_new_msg, chat)) {
icon_name = EMPATHY_IMAGE_MESSAGE;
}
else if (g_list_find (priv->chats_composing, chat)) {
icon_name = EMPATHY_IMAGE_TYPING;
}
- else {
- icon_name = empathy_chat_get_status_icon_name (chat);
+ else if (remote_contact) {
+ icon_name = empathy_icon_name_for_contact (remote_contact);
+ } else {
+ icon_name = EMPATHY_IMAGE_GROUP_MESSAGE;
}
- image = g_object_get_data (G_OBJECT (chat), "chat-window-tab-image");
- gtk_image_set_from_icon_name (image, icon_name, GTK_ICON_SIZE_MENU);
+ 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);
- chat_window_update_title (window, chat);
- chat_window_update_tooltip (window, 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));
+ } else {
+ g_string_append (tooltip, name);
+ }
+ if (subject) {
+ g_string_append_printf (tooltip, "\n%s %s", _("Topic:"), subject);
+ }
+ if (g_list_find (priv->chats_composing, chat)) {
+ g_string_append_printf (tooltip, "\n%s", _("Typing a message."));
+ }
+ str = 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);
+
+ /* Update tab label */
+ widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
+ gtk_label_set_text (GTK_LABEL (widget), name);
+
+ /* Update window title? */
+ if (priv->current_chat == chat) {
+ chat_window_update_title (window);
+ }
}
static void
-chat_window_update_menu (EmpathyChatWindow *window)
+chat_window_remote_contact_notify_cb (EmpathyChat *chat)
{
- EmpathyChatWindowPriv *priv;
- gboolean first_page;
- gboolean last_page;
- gboolean is_connected;
- gint num_pages;
- gint page_num;
-
- priv = GET_PRIV (window);
-
- /* Notebook pages */
- page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
- num_pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (priv->notebook));
- first_page = (page_num == 0);
- last_page = (page_num == (num_pages - 1));
+ EmpathyTpChat *tp_chat;
+ EmpathyContact *old_remote_contact;
+ EmpathyContact *remote_contact = NULL;
- 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);
+ old_remote_contact = g_object_get_data (G_OBJECT (chat), "chat-window-remote-contact");
+ tp_chat = empathy_chat_get_tp_chat (chat);
+ if (tp_chat) {
+ remote_contact = empathy_tp_chat_get_remote_contact (tp_chat);
+ }
- is_connected = empathy_chat_is_connected (priv->current_chat);
+ if (old_remote_contact != remote_contact) {
+ /* The remote-contact associated with the chat changed, we need
+ * to keep track of any change of that contact and update the
+ * window each time. */
+ if (remote_contact) {
+ g_signal_connect_swapped (remote_contact, "notify",
+ G_CALLBACK (chat_window_update_chat),
+ chat);
+ }
+ if (old_remote_contact) {
+ g_signal_handlers_disconnect_by_func (old_remote_contact,
+ chat_window_update_chat,
+ chat);
+ }
- if (empathy_chat_is_group_chat (priv->current_chat)) {
- EmpathyGroupChat *group_chat;
- EmpathyChatroom *chatroom;
- gboolean show_contacts;
+ g_object_set_data (G_OBJECT (chat), "chat-window-remote-contact",
+ remote_contact);
- group_chat = EMPATHY_GROUP_CHAT (priv->current_chat);
+ chat_window_update_chat (chat);
+ }
+}
- /* Show / Hide widgets */
- gtk_widget_show (priv->menu_room);
+static void
+chat_window_weak_ref_cb (gpointer data,
+ GObject *chat)
+{
+ EmpathyTpChat *tp_chat;
+ EmpathyContact *remote_contact;
- gtk_widget_hide (priv->menu_conv_add_contact);
- gtk_widget_hide (priv->menu_conv_info);
- gtk_widget_hide (priv->menu_conv_separator);
+ tp_chat = g_object_get_data (chat, "chat-window-tp-chat");
+ if (tp_chat) {
+ g_signal_handlers_disconnect_by_func (tp_chat,
+ chat_window_remote_contact_notify_cb,
+ chat);
+ }
- /* Can we add this room to our favourites and are we
- * connected to the room?
- */
- chatroom = empathy_chatroom_manager_find (priv->chatroom_manager,
- empathy_chat_get_account (priv->current_chat),
- empathy_chat_get_id (priv->current_chat));
-
- gtk_widget_set_sensitive (priv->menu_room_add, chatroom == NULL);
- gtk_widget_set_sensitive (priv->menu_conv_insert_smiley, is_connected);
- gtk_widget_set_sensitive (priv->menu_room_join_new, is_connected);
- gtk_widget_set_sensitive (priv->menu_room_invite, is_connected);
-
- /* We need to block the signal here because all we are
- * really trying to do is check or uncheck the menu
- * item. If we don't do this we get funny behaviour
- * with 2 or more group chat windows where showing
- * contacts doesn't do anything.
- */
- show_contacts = empathy_group_chat_get_show_contacts (group_chat);
+ remote_contact = g_object_get_data (chat, "chat-window-remote-contact");
+ if (remote_contact) {
+ g_signal_handlers_disconnect_by_func (remote_contact,
+ chat_window_update_chat,
+ chat);
+ }
+}
- g_signal_handlers_block_by_func (priv->menu_room_show_contacts,
- chat_window_show_contacts_toggled_cb,
- window);
+static void
+chat_window_chat_notify_cb (EmpathyChat *chat)
+{
+ EmpathyTpChat *tp_chat;
+ EmpathyTpChat *old_tp_chat;
- g_object_set (priv->menu_room_show_contacts,
- "active", show_contacts,
- NULL);
+ old_tp_chat = g_object_get_data (G_OBJECT (chat), "chat-window-tp-chat");
+ tp_chat = empathy_chat_get_tp_chat (chat);
- g_signal_handlers_unblock_by_func (priv->menu_room_show_contacts,
- chat_window_show_contacts_toggled_cb,
- window);
- } else {
- EmpathyPrivateChat *chat;
- EmpathyContact *contact;
- McPresence presence;
-
- chat = EMPATHY_PRIVATE_CHAT (priv->current_chat);
-
- /* Show / Hide widgets */
- gtk_widget_hide (priv->menu_room);
-
- /* Unset presence means this contact refuses to send us his
- * presence. By adding the contact we ask the contact to accept
- * to send his presence. */
- contact = empathy_private_chat_get_contact (chat);
- presence = empathy_contact_get_presence (contact);
- if (presence == MC_PRESENCE_UNSET) {
- gtk_widget_show (priv->menu_conv_add_contact);
- } else {
- gtk_widget_hide (priv->menu_conv_add_contact);
+ if (old_tp_chat != tp_chat) {
+ /* The TpChat associated with the chat has changed, we need to
+ * keep track of it's remote-contact if there is one. */
+ if (tp_chat) {
+ g_signal_connect_swapped (tp_chat, "notify::remote-contact",
+ G_CALLBACK (chat_window_remote_contact_notify_cb),
+ chat);
+ g_object_weak_ref (G_OBJECT (chat),
+ chat_window_weak_ref_cb,
+ NULL);
}
+ if (old_tp_chat) {
+ g_signal_handlers_disconnect_by_func (old_tp_chat,
+ chat_window_remote_contact_notify_cb,
+ chat);
+ }
+ g_object_set_data (G_OBJECT (chat), "chat-window-tp-chat", tp_chat);
- gtk_widget_show (priv->menu_conv_separator);
- gtk_widget_show (priv->menu_conv_info);
-
- /* Are we connected? */
- gtk_widget_set_sensitive (priv->menu_conv_insert_smiley, is_connected);
- gtk_widget_set_sensitive (priv->menu_conv_add_contact, is_connected);
- gtk_widget_set_sensitive (priv->menu_conv_info, is_connected);
+ /* This will call chat_window_update_chat() if the remote-contact
+ * changed, so we don't have to call it again. That's why we
+ * return here. */
+ chat_window_remote_contact_notify_cb (chat);
+ return;
}
+
+ chat_window_update_chat (chat);
}
static void
@@ -495,69 +528,6 @@
empathy_chat_clear (priv->current_chat);
}
-static void
-chat_window_add_contact_activate_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv;
- //EmpathyContact *contact;
-
- priv = GET_PRIV (window);
-
- //contact = empathy_chat_get_contact (priv->current_chat);
-
- // FIXME: empathy_add_contact_dialog_show (NULL, contact);
-}
-
-static void
-chat_window_call_activate_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv;
-
- priv = GET_PRIV (window);
-
- if (!empathy_chat_is_group_chat (priv->current_chat)) {
- EmpathyPrivateChat *chat;
- EmpathyContact *contact;
-
- chat = EMPATHY_PRIVATE_CHAT (priv->current_chat);
- contact = empathy_private_chat_get_contact (chat);
-
- empathy_call_with_contact (contact);
- }
-}
-
-static void
-chat_window_log_activate_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv;
-
- priv = GET_PRIV (window);
-
- empathy_log_window_show (empathy_chat_get_account (priv->current_chat),
- empathy_chat_get_id (priv->current_chat),
- empathy_chat_is_group_chat (priv->current_chat),
- GTK_WINDOW (priv->dialog));
-}
-
-static void
-chat_window_info_activate_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv;
- EmpathyContact *contact;
-
- priv = GET_PRIV (window);
-
- contact = empathy_private_chat_get_contact (EMPATHY_PRIVATE_CHAT (priv->current_chat));
-
- empathy_contact_information_dialog_show (contact,
- GTK_WINDOW (priv->dialog),
- FALSE, FALSE);
-}
-
static const gchar *
chat_get_window_id_for_geometry (EmpathyChat *chat)
{
@@ -615,57 +585,6 @@
}
static void
-chat_window_conv_activate_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv;
- EmpathyLogManager *manager;
- gboolean log_exists = FALSE;
- gboolean can_voip = FALSE;
-
- priv = GET_PRIV (window);
-
- manager = empathy_log_manager_new ();
- log_exists = empathy_log_manager_exists (manager,
- empathy_chat_get_account (priv->current_chat),
- empathy_chat_get_id (priv->current_chat),
- empathy_chat_is_group_chat (priv->current_chat));
- g_object_unref (manager);
-
- if (!empathy_chat_is_group_chat (priv->current_chat)) {
- EmpathyPrivateChat *chat;
- EmpathyContact *contact;
-
- chat = EMPATHY_PRIVATE_CHAT (priv->current_chat);
- contact = empathy_private_chat_get_contact (chat);
- can_voip = empathy_contact_can_voip (contact);
- }
-
- gtk_widget_set_sensitive (priv->menu_conv_log, log_exists);
-#ifdef HAVE_VOIP
- gtk_widget_set_sensitive (priv->menu_conv_call, can_voip);
-#else
- g_object_set (priv->menu_conv_call, "visible", FALSE, NULL);
- g_object_set (priv->menu_conv_call_separator, "visible", FALSE, NULL);
-#endif
-}
-
-static void
-chat_window_show_contacts_toggled_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv;
- gboolean show;
-
- priv = GET_PRIV (window);
-
- g_return_if_fail (priv->current_chat != NULL);
-
- show = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (priv->menu_room_show_contacts));
- empathy_group_chat_set_show_contacts (EMPATHY_GROUP_CHAT (priv->current_chat), show);
-}
-
-static void
chat_window_close_activate_cb (GtkWidget *menuitem,
EmpathyChatWindow *window)
{
@@ -679,80 +598,6 @@
}
static void
-chat_window_room_set_topic_activate_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv = GET_PRIV (window);
-
- if (empathy_chat_is_group_chat (priv->current_chat)) {
- empathy_group_chat_set_topic (EMPATHY_GROUP_CHAT (priv->current_chat));
- }
-}
-
-static void
-chat_window_room_join_new_activate_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv;
-
- priv = GET_PRIV (window);
-
- empathy_new_chatroom_dialog_show (GTK_WINDOW (priv->dialog));
-}
-
-static void
-chat_window_room_invite_activate_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
-{
-/* FIXME:
- EmpathyChatWindowPriv *priv;
- EmpathyContact *own_contact;
- EmpathyChatroomId id = 0;
-
- priv = GET_PRIV (window);
- own_contact = empathy_chat_get_own_contact (priv->current_chat);
-
- if (empathy_chat_is_group_chat (priv->current_chat)) {
- EmpathyGroupChat *group_chat;
-
- group_chat = EMPATHY_GROUP_CHAT (priv->current_chat);
- id = empathy_group_chat_get_chatroom_id (group_chat);
- }
-
- empathy_chat_invite_dialog_show (own_contact, id);
-*/
-}
-
-static void
-chat_window_room_add_activate_cb (GtkWidget *menuitem,
- EmpathyChatWindow *window)
-{
- EmpathyChatWindowPriv *priv;
- EmpathyChatroomManager *manager;
- EmpathyChatroom *chatroom;
-
- priv = GET_PRIV (window);
-
- g_return_if_fail (priv->current_chat != NULL);
-
- if (!empathy_chat_is_group_chat (priv->current_chat)) {
- return;
- }
-
- chatroom = empathy_chatroom_new_full (empathy_chat_get_account (priv->current_chat),
- empathy_chat_get_id (priv->current_chat),
- empathy_chat_get_name (priv->current_chat),
- FALSE);
-
- manager = empathy_chatroom_manager_new ();
- empathy_chatroom_manager_add (manager, chatroom);
- chat_window_update_menu (window);
-
- g_object_unref (chatroom);
- g_object_unref (manager);
-}
-
-static void
chat_window_edit_activate_cb (GtkWidget *menuitem,
EmpathyChatWindow *window)
{
@@ -765,7 +610,7 @@
g_return_if_fail (priv->current_chat != NULL);
- if (!empathy_chat_is_connected (priv->current_chat)) {
+ 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);
@@ -847,11 +692,8 @@
}
gtk_notebook_reorder_child (GTK_NOTEBOOK (priv->notebook),
- empathy_chat_get_widget (chat),
+ GTK_WIDGET (chat),
index - 1);
-
- chat_window_update_menu (window);
- chat_window_update_status (window, chat);
}
static void
@@ -868,11 +710,8 @@
index = gtk_notebook_get_current_page (GTK_NOTEBOOK (priv->notebook));
gtk_notebook_reorder_child (GTK_NOTEBOOK (priv->notebook),
- empathy_chat_get_widget (chat),
+ GTK_WIDGET (chat),
index + 1);
-
- chat_window_update_menu (window);
- chat_window_update_status (window, chat);
}
static void
@@ -935,26 +774,6 @@
}
static void
-chat_window_status_changed_cb (EmpathyChat *chat,
- EmpathyChatWindow *window)
-{
- chat_window_update_menu (window);
- chat_window_update_status (window, chat);
-}
-
-static void
-chat_window_name_changed_cb (EmpathyChat *chat,
- const gchar *name,
- EmpathyChatWindow *window)
-{
- GtkLabel *label;
-
- label = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");
-
- gtk_label_set_text (label, name);
-}
-
-static void
chat_window_composing_cb (EmpathyChat *chat,
gboolean is_composing,
EmpathyChatWindow *window)
@@ -969,13 +788,26 @@
priv->chats_composing = g_list_remove (priv->chats_composing, chat);
}
- chat_window_update_status (window, chat);
+ chat_window_update_chat (chat);
+}
+
+static void
+chat_window_set_urgency_hint (EmpathyChatWindow *window,
+ gboolean urgent)
+{
+ EmpathyChatWindowPriv *priv;
+
+ priv = GET_PRIV (window);
+
+ empathy_debug (DEBUG_DOMAIN, "Turning %s urgency hint",
+ urgent ? "on" : "off");
+ gtk_window_set_urgency_hint (GTK_WINDOW (priv->dialog), urgent);
}
static void
chat_window_new_message_cb (EmpathyChat *chat,
EmpathyMessage *message,
-s EmpathyChatWindow *window)
+ EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv;
gboolean has_focus;
@@ -989,8 +821,7 @@
return;
}
- needs_urgency = (empathy_chat_is_group_chat (chat) &&
- empathy_message_should_highlight (message));
+ needs_urgency = empathy_message_should_highlight (message);
if (needs_urgency && !has_focus) {
chat_window_set_urgency_hint (window, TRUE);
@@ -998,7 +829,7 @@
if (!g_list_find (priv->chats_new_msg, chat)) {
priv->chats_new_msg = g_list_prepend (priv->chats_new_msg, chat);
- chat_window_update_status (window, chat);
+ chat_window_update_chat (chat);
}
}
@@ -1013,7 +844,7 @@
EmpathyChatWindow *window, *new_window;
EmpathyChat *chat;
- chat = g_object_get_data (G_OBJECT (page), "chat");
+ chat = EMPATHY_CHAT (page);
window = chat_window_find_chat (chat);
new_window = empathy_chat_window_new ();
@@ -1044,7 +875,7 @@
priv = GET_PRIV (window);
child = gtk_notebook_get_nth_page (notebook, page_num);
- chat = g_object_get_data (G_OBJECT (child), "chat");
+ chat = EMPATHY_CHAT (child);
if (priv->page_added) {
priv->page_added = FALSE;
@@ -1058,7 +889,7 @@
priv->chats_new_msg = g_list_remove (priv->chats_new_msg, chat);
chat_window_update_menu (window);
- chat_window_update_status (window, chat);
+ chat_window_update_title (window);
}
static void
@@ -1070,6 +901,7 @@
empathy_debug (DEBUG_DOMAIN, "Page reordered");
chat_window_update_menu (window);
+ chat_window_update_title (window);
}
static void
@@ -1096,15 +928,9 @@
empathy_debug (DEBUG_DOMAIN, "Page added");
/* Get chat object */
- chat = g_object_get_data (G_OBJECT (child), "chat");
+ chat = EMPATHY_CHAT (child);
/* Connect chat signals for this window */
- g_signal_connect (chat, "status-changed",
- G_CALLBACK (chat_window_status_changed_cb),
- window);
- g_signal_connect (chat, "name-changed",
- G_CALLBACK (chat_window_name_changed_cb),
- window);
g_signal_connect (chat, "composing",
G_CALLBACK (chat_window_composing_cb),
window);
@@ -1144,16 +970,10 @@
empathy_debug (DEBUG_DOMAIN, "Page removed");
/* Get chat object */
- chat = g_object_get_data (G_OBJECT (child), "chat");
+ chat = EMPATHY_CHAT (child);
/* Disconnect all signal handlers for this chat and this window */
g_signal_handlers_disconnect_by_func (chat,
- G_CALLBACK (chat_window_status_changed_cb),
- window);
- g_signal_handlers_disconnect_by_func (chat,
- G_CALLBACK (chat_window_name_changed_cb),
- window);
- g_signal_handlers_disconnect_by_func (chat,
G_CALLBACK (chat_window_composing_cb),
window);
g_signal_handlers_disconnect_by_func (chat,
@@ -1168,8 +988,7 @@
if (priv->chats == NULL) {
g_object_unref (window);
} else {
- chat_window_update_menu (window);
- chat_window_update_title (window, NULL);
+ chat_window_update_chat (chat);
}
}
@@ -1189,7 +1008,7 @@
chat_window_set_urgency_hint (window, FALSE);
/* Update the title, since we now mark all unread messages as read. */
- chat_window_update_status (window, priv->current_chat);
+ chat_window_update_chat (priv->current_chat);
return FALSE;
}
@@ -1264,7 +1083,7 @@
}
if (child) {
- chat = g_object_get_data (G_OBJECT (*child), "chat");
+ chat = EMPATHY_CHAT (child);
}
old_window = chat_window_find_chat (chat);
@@ -1296,19 +1115,6 @@
}
static void
-chat_window_set_urgency_hint (EmpathyChatWindow *window,
- gboolean urgent)
-{
- EmpathyChatWindowPriv *priv;
-
- priv = GET_PRIV (window);
-
- empathy_debug (DEBUG_DOMAIN, "Turning %s urgency hint",
- urgent ? "on" : "off");
- gtk_window_set_urgency_hint (GTK_WINDOW (priv->dialog), urgent);
-}
-
-static void
chat_window_finalize (GObject *object)
{
EmpathyChatWindow *window;
@@ -1326,11 +1132,6 @@
chat_windows = g_list_remove (chat_windows, window);
gtk_widget_destroy (priv->dialog);
- g_signal_handlers_disconnect_by_func (priv->chatroom_manager,
- chat_window_update_menu,
- window);
- g_object_unref (priv->chatroom_manager);
-
G_OBJECT_CLASS (empathy_chat_window_parent_class)->finalize (object);
}
@@ -1339,7 +1140,7 @@
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = empathy_chat_window_finalize;
+ object_class->finalize = chat_window_finalize;
g_type_class_add_private (object_class, sizeof (EmpathyChatWindowPriv));
@@ -1362,7 +1163,6 @@
EmpathyChatWindowPriv *priv;
GladeXML *glade;
GtkAccelGroup *accel_group;
- GtkWidget *image;
GClosure *closure;
GtkWidget *menu_conv;
GtkWidget *menu;
@@ -1381,19 +1181,8 @@
"menu_conv", &menu_conv,
"menu_conv_clear", &priv->menu_conv_clear,
"menu_conv_insert_smiley", &priv->menu_conv_insert_smiley,
- "menu_conv_call", &priv->menu_conv_call,
- "menu_conv_call_separator", &priv->menu_conv_call_separator,
- "menu_conv_log", &priv->menu_conv_log,
- "menu_conv_separator", &priv->menu_conv_separator,
- "menu_conv_add_contact", &priv->menu_conv_add_contact,
- "menu_conv_info", &priv->menu_conv_info,
+ "menu_conv_contact", &priv->menu_conv_contact,
"menu_conv_close", &priv->menu_conv_close,
- "menu_room", &priv->menu_room,
- "menu_room_set_topic", &priv->menu_room_set_topic,
- "menu_room_join_new", &priv->menu_room_join_new,
- "menu_room_invite", &priv->menu_room_invite,
- "menu_room_add", &priv->menu_room_add,
- "menu_room_show_contacts", &priv->menu_room_show_contacts,
"menu_edit_cut", &priv->menu_edit_cut,
"menu_edit_copy", &priv->menu_edit_copy,
"menu_edit_paste", &priv->menu_edit_paste,
@@ -1410,17 +1199,8 @@
empathy_glade_connect (glade,
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_call", "activate", chat_window_call_activate_cb,
- "menu_conv_log", "activate", chat_window_log_activate_cb,
- "menu_conv_add_contact", "activate", chat_window_add_contact_activate_cb,
- "menu_conv_info", "activate", chat_window_info_activate_cb,
"menu_conv_close", "activate", chat_window_close_activate_cb,
- "menu_room_set_topic", "activate", chat_window_room_set_topic_activate_cb,
- "menu_room_join_new", "activate", chat_window_room_join_new_activate_cb,
- "menu_room_invite", "activate", chat_window_room_invite_activate_cb,
- "menu_room_add", "activate", chat_window_room_add_activate_cb,
"menu_edit", "activate", chat_window_edit_activate_cb,
"menu_edit_cut", "activate", chat_window_cut_activate_cb,
"menu_edit_copy", "activate", chat_window_copy_activate_cb,
@@ -1434,15 +1214,6 @@
g_object_unref (glade);
- /* Set up chatroom manager */
- priv->chatroom_manager = empathy_chatroom_manager_new ();
- g_signal_connect_swapped (priv->chatroom_manager, "chatroom-added",
- G_CALLBACK (chat_window_update_menu),
- window);
- g_signal_connect_swapped (priv->chatroom_manager, "chatroom-removed",
- G_CALLBACK (chat_window_update_menu),
- window);
-
priv->notebook = gtk_notebook_new ();
gtk_notebook_set_group (GTK_NOTEBOOK (priv->notebook), "EmpathyChatWindow");
gtk_box_pack_start (GTK_BOX (chat_vbox), priv->notebook, TRUE, TRUE, 0);
@@ -1465,14 +1236,6 @@
g_object_unref (accel_group);
- /* Set the contact information menu item image to the Empathy
- * stock image
- */
- image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (priv->menu_conv_info));
- gtk_image_set_from_icon_name (GTK_IMAGE (image),
- EMPATHY_IMAGE_CONTACT_INFORMATION,
- GTK_ICON_SIZE_MENU);
-
/* Set up smiley menu */
menu = empathy_chat_view_get_smiley_menu (
G_CALLBACK (chat_window_insert_smiley_activate_cb),
@@ -1488,11 +1251,6 @@
G_CALLBACK (chat_window_delete_event_cb),
window);
- g_signal_connect (priv->menu_room_show_contacts,
- "toggled",
- G_CALLBACK (chat_window_show_contacts_toggled_cb),
- window);
-
g_signal_connect_swapped (priv->menu_tabs_prev,
"activate",
G_CALLBACK (gtk_notebook_prev_page),
@@ -1614,7 +1372,7 @@
/* Reference the chat object */
g_object_ref (chat);
- empathy_geometry_load (chat_get_window_id_for_geometry (chat), x, y, w, h);
+ 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
@@ -1630,9 +1388,20 @@
gtk_window_resize (GTK_WINDOW (priv->dialog), w, h);
}
- child = empathy_chat_get_widget (chat);
+ child = GTK_WIDGET (chat);
label = chat_window_create_label (window, chat);
+ g_signal_connect_swapped (chat, "notify::name",
+ G_CALLBACK (chat_window_chat_notify_cb),
+ window);
+ g_signal_connect_swapped (chat, "notify::subject",
+ G_CALLBACK (chat_window_chat_notify_cb),
+ window);
+ g_signal_connect_swapped (chat, "notify::tp-chat",
+ G_CALLBACK (chat_window_chat_notify_cb),
+ window);
+ chat_window_chat_notify_cb (chat);
+
gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook), child, label);
gtk_notebook_set_tab_reorderable (GTK_NOTEBOOK (priv->notebook), child, TRUE);
gtk_notebook_set_tab_detachable (GTK_NOTEBOOK (priv->notebook), child, TRUE);
@@ -1657,9 +1426,13 @@
priv = GET_PRIV (window);
position = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook),
- empathy_chat_get_widget (chat));
+ GTK_WIDGET (chat));
gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), position);
+ g_signal_handlers_disconnect_by_func (chat,
+ chat_window_chat_notify_cb,
+ window);
+
empathy_debug (DEBUG_DOMAIN,
"Chat removed (%d references)",
G_OBJECT (chat)->ref_count - 1);
@@ -1678,7 +1451,7 @@
g_return_if_fail (EMPATHY_IS_CHAT_WINDOW (new_window));
g_return_if_fail (EMPATHY_IS_CHAT (chat));
- widget = empathy_chat_get_widget (chat);
+ widget = GTK_WIDGET (chat);
empathy_debug (DEBUG_DOMAIN,
"Chat moving with widget:%p (%d references)",
@@ -1711,7 +1484,7 @@
priv = GET_PRIV (window);
page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook),
- empathy_chat_get_widget (chat));
+ GTK_WIDGET (chat));
gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook),
page_num);
}
@@ -1790,21 +1563,17 @@
gtk_widget_grab_focus (chat->input_text_view);
}
-
+#if 0
static gboolean
-chat_should_play_sound (EmpathyChat *chat)
+chat_window_should_play_sound (EmpathyChatWindow *window)
{
- EmpathyChatPriv *priv = GET_PRIV (chat);
- GtkWindow *window;
- gboolean has_focus = FALSE;
+ EmpathyChatWindowPriv *priv = GET_PRIV (window);
+ gboolean has_focus = FALSE;
- g_return_val_if_fail (EMPATHY_IS_CHAT (chat), FALSE);
+ g_return_val_if_fail (EMPATHY_IS_CHAT_WINDOW (window), FALSE);
- window = empathy_get_toplevel_window (priv->widget);
- if (window) {
- g_object_get (window, "has-toplevel-focus", &has_focus, NULL);
- }
+ g_object_get (priv->dialog, "has-toplevel-focus", &has_focus, NULL);
return !has_focus;
}
-
+#endif
Modified: trunk/src/empathy-chat-window.glade
==============================================================================
--- trunk/src/empathy-chat-window.glade (original)
+++ trunk/src/empathy-chat-window.glade Wed Apr 2 10:42:04 2008
@@ -42,56 +42,22 @@
</widget>
</child>
<child>
- <widget class="GtkSeparatorMenuItem" id="menu_conv_contact_separator">
+ <widget class="GtkSeparatorMenuItem" id="separator7">
<property name="visible">True</property>
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="menu_conv_call">
+ <widget class="GtkMenuItem" id="menu_conv_contact">
<property name="visible">True</property>
- <property name="label" translatable="yes">Ca_ll</property>
+ <property name="label" translatable="yes">_Contact</property>
<property name="use_underline">True</property>
- <child internal-child="image">
- <widget class="GtkImage" id="menu_conv_call_image">
- <property name="visible">True</property>
- <property name="icon_size">1</property>
- <property name="icon_name">gnome-stock-mic</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkImageMenuItem" id="menu_conv_log">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_View Previous Conversations</property>
- <property name="use_underline">True</property>
- <accelerator key="F3" modifiers="" signal="activate"/>
- <child internal-child="image">
- <widget class="GtkImage" id="image263">
- <property name="visible">True</property>
- <property name="icon_size">1</property>
- <property name="icon_name">document-open-recent</property>
- </widget>
- </child>
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="menu_conv_info">
+ <widget class="GtkSeparatorMenuItem" id="menuitem1">
<property name="visible">True</property>
- <property name="label" translatable="yes">Contact Infor_mation</property>
+ <property name="label" translatable="yes">menuitem1</property>
<property name="use_underline">True</property>
- <child internal-child="image">
- <widget class="GtkImage" id="image265">
- <property name="visible">True</property>
- <property name="stock">gtk-info</property>
- <property name="icon_size">1</property>
- </widget>
- </child>
- </widget>
- </child>
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator7">
- <property name="visible">True</property>
</widget>
</child>
<child>
Modified: trunk/src/empathy-chat-window.h
==============================================================================
--- trunk/src/empathy-chat-window.h (original)
+++ trunk/src/empathy-chat-window.h Wed Apr 2 10:42:04 2008
@@ -29,6 +29,7 @@
#define __EMPATHY_CHAT_WINDOW_H__
#include <glib-object.h>
+#include <gtk/gtkwidget.h>
#include <libmissioncontrol/mc-account.h>
#include <libempathy-gtk/empathy-chat.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
