#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>
NotifyNotification *notification;
/* Menu items. */
- GtkWidget *menu_conv_clear;
- GtkWidget *menu_conv_insert_smiley;
- GtkWidget *menu_conv_contact;
- GtkWidget *menu_conv_favorite;
- 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;
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) {
}
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 */
- if (empathy_chat_is_room (priv->current_chat)) {
+ is_room = empathy_chat_is_room (priv->current_chat);
+ if (is_room) {
const gchar *room;
McAccount *account;
gboolean found;
account, room) != NULL;
DEBUG ("This room %s favorite", found ? "is" : "is not");
- gtk_check_menu_item_set_active (
- GTK_CHECK_MENU_ITEM (priv->menu_conv_favorite), found);
- gtk_widget_show (priv->menu_conv_favorite);
- } else {
- gtk_widget_hide (priv->menu_conv_favorite);
+ 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);
}
static void
-chat_window_favorite_toggled_cb (GtkCheckMenuItem *menuitem,
+chat_window_favorite_toggled_cb (GtkToggleAction *toggle_action,
EmpathyChatWindow *window)
{
EmpathyChatWindowPriv *priv = GET_PRIV (window);
const gchar *room;
EmpathyChatroom *chatroom;
- active = gtk_check_menu_item_get_active (menuitem);
+ active = gtk_toggle_action_get_active (toggle_action);
account = empathy_chat_get_account (priv->current_chat);
room = empathy_chat_get_id (priv->current_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_has_selection (buffer)) {
- gtk_widget_set_sensitive (priv->menu_edit_copy, TRUE);
- gtk_widget_set_sensitive (priv->menu_edit_cut, TRUE);
+ 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_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 (menuitem, "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);
chat_window_notification_closed_cb (NotifyNotification *notify,
NotificationData *cb_data)
{
- int reason = 0;
+ 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 == NOTIFICATION_CLOSED_DISMISSED) {
+ if (reason == EMPATHY_NOTIFICATION_CLOSED_DISMISSED) {
empathy_chat_window_present_chat (cb_data->chat);
}
empathy_contact_get_name (sender));
body = empathy_message_get_body (message);
escaped = g_markup_escape_text (body, -1);
- pixbuf = empathy_pixbuf_avatar_from_contact_scaled (sender, 48, 48);
- if (pixbuf == NULL) {
- pixbuf = empathy_pixbuf_from_icon_name_sized
- (EMPATHY_IMAGE_NEW_MESSAGE, 48);
- }
+
+ pixbuf = empathy_misc_get_pixbuf_for_notification (sender, EMPATHY_IMAGE_NEW_MESSAGE);
if (priv->notification != NULL) {
notify_notification_update (priv->notification,
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;
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);
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;
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_favorite", &priv->menu_conv_favorite,
- "menu_conv_close", &priv->menu_conv_close,
"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_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);
/* Set up smiley menu */
smiley_manager = empathy_smiley_manager_dup_singleton ();
- menu = empathy_smiley_menu_new (smiley_manager,
- chat_window_insert_smiley_activate_cb,
- window);
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (priv->menu_conv_insert_smiley),
- menu);
+ 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 glade since we may need to
+ /* Set up signals we can't do with ui file since we may need to
* block/unblock them at some later stage.
*/
}
if (w > 0 && h > 0) {
- /* Use the defaults from the glade file if we don't have
+ /* 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);
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