#include "empathy-chat-manager.h"
#include "empathy-chatroom-manager.h"
#include "empathy-chatrooms-window.h"
+#include "empathy-client-factory.h"
#include "empathy-contact-blocking-dialog.h"
#include "empathy-contact-search-dialog.h"
#include "empathy-event-manager.h"
}
static void
-roster_window_favorite_chatroom_menu_activate_cb (GAction *action,
+roster_window_join_chatroom_menu_activate_cb (GSimpleAction *action,
GVariant *parameter,
- EmpathyChatroom *chatroom)
+ gpointer user_data)
{
+ EmpathyRosterWindow *self = user_data;
+ const gchar *room, *path;
+ EmpathyClientFactory *factory;
+ TpAccount *account;
+ GError *error = NULL;
+ EmpathyChatroom *chatroom;
+
+ g_variant_get (parameter, "(&s&s)", &room, &path);
+
+ factory = empathy_client_factory_dup ();
+
+ account = tp_simple_client_factory_ensure_account (
+ TP_SIMPLE_CLIENT_FACTORY (factory), path, NULL, &error);
+ if (account == NULL)
+ {
+ DEBUG ("Failed to get account '%s': %s", path, error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ chatroom = empathy_chatroom_manager_find (self->priv->chatroom_manager,
+ account, room);
+ if (chatroom == NULL)
+ {
+ DEBUG ("Failed to get chatroom '%s' on '%s'",
+ room, path);
+ goto out;
+ }
+
roster_window_favorite_chatroom_join (chatroom);
-}
-static gchar *
-dup_join_action_name (EmpathyChatroom *chatroom,
- gboolean prefix)
-{
- return g_strconcat (prefix ? "win." : "", "join-",
- empathy_chatroom_get_name (chatroom), NULL);
+out:
+ g_object_unref (factory);
}
static void
EmpathyChatroom *chatroom)
{
GMenuItem *item;
- const gchar *name, *account_name;
- gchar *label, *action_name;
- GAction *action;
+ const gchar *name, *account_name, *account_path;
+ TpAccount *account;
+ gchar *label;
+
+ account = empathy_chatroom_get_account (chatroom);
name = empathy_chatroom_get_name (chatroom);
- account_name = tp_account_get_display_name (
- empathy_chatroom_get_account (chatroom));
+ account_name = tp_account_get_display_name (account);
+ account_path = tp_proxy_get_object_path (account);
label = g_strdup_printf ("%s (%s)", name, account_name);
- action_name = dup_join_action_name (chatroom, FALSE);
-
- action = (GAction *) g_simple_action_new (action_name, NULL);
- g_free (action_name);
-
- g_signal_connect (action, "activate",
- G_CALLBACK (roster_window_favorite_chatroom_menu_activate_cb),
- chatroom);
-
- g_action_map_add_action (G_ACTION_MAP (self), action);
-
- action_name = dup_join_action_name (chatroom, TRUE);
- item = g_menu_item_new (label, action_name);
+ item = g_menu_item_new (label, NULL);
+ g_menu_item_set_action_and_target (item, "win.join", "(ss)",
+ name, account_path);
g_menu_item_set_attribute (item, "room-name", "s", name);
+ g_menu_item_set_attribute (item, "account-path", "s", account_path);
g_menu_append_item (self->priv->rooms_section, item);
g_free (label);
- g_free (action_name);
- g_object_unref (action);
}
static void
EmpathyRosterWindow *self)
{
GList *chatrooms;
- gchar *act;
- gint i;
+ guint i, n;
+ TpAccount *account;
+ const gchar *account_path;
- act = dup_join_action_name (chatroom, TRUE);
+ account = empathy_chatroom_get_account (chatroom);
+ account_path = tp_proxy_get_object_path (account);
- g_action_map_remove_action (G_ACTION_MAP (self), act);
+ n = g_menu_model_get_n_items (G_MENU_MODEL (self->priv->rooms_section));
- for (i = 0; i < g_menu_model_get_n_items (
- G_MENU_MODEL (self->priv->rooms_section)); i++)
+ for (i = 0; i < n; i++)
{
- const gchar *name;
+ gchar *tmp;
+
+ if (!g_menu_model_get_item_attribute (
+ G_MENU_MODEL (self->priv->rooms_section), i,
+ "room-name", "s", &tmp))
+ continue;
- if (g_menu_model_get_item_attribute (
- G_MENU_MODEL (self->priv->rooms_section), i, "room-name",
- "s", &name)
- && !tp_strdiff (name, empathy_chatroom_get_name (chatroom)))
+ if (tp_strdiff (tmp, empathy_chatroom_get_name (chatroom)))
{
- g_menu_remove (self->priv->rooms_section, i);
- break;
+ g_free (tmp);
+ continue;
}
+
+ g_free (tmp);
+
+ if (!g_menu_model_get_item_attribute (
+ G_MENU_MODEL (self->priv->rooms_section), i,
+ "account-path", "s", &tmp))
+ continue;
+
+ if (tp_strdiff (tmp, account_path))
+ {
+ g_free (tmp);
+ continue;
+ }
+
+ g_menu_remove (self->priv->rooms_section, i);
+ g_free (tmp);
+ break;
}
chatrooms = empathy_chatroom_manager_get_chatrooms (
{
if (g_settings_get_boolean (self->priv->gsettings_ui,
EMPATHY_PREFS_UI_SHOW_OFFLINE))
- display_page_message (self, _("You haven't added any contact yet"),
+ display_page_message (self, _("You haven't added any contacts yet"),
PAGE_MESSAGE_FLAG_ADD_CONTACT);
else
display_page_message (self, _("No online contacts"),
{ "room_join_new", roster_window_room_join_new_cb, NULL, NULL, NULL },
{ "room_join_favorites", roster_window_room_join_favorites_cb, NULL, NULL, NULL },
+ { "join", roster_window_join_chatroom_menu_activate_cb, "(ss)", NULL, NULL },
{ "room_manage_favorites", roster_window_room_manage_favorites_cb, NULL, NULL, NULL },
{ "help_contents", roster_window_help_contents_cb, NULL, NULL, NULL },
GtkWidget *sw;
gchar *filename;
GtkWidget *search_vbox;
+ GtkWidget *header_bar;
+ GtkWidget *new_conversation_button;
+ GtkWidget *image;
guint i;
EmpathyRosterModel *model;
NULL);
g_free (filename);
+ header_bar = gtk_header_bar_new ();
+ gtk_header_bar_set_title (GTK_HEADER_BAR(header_bar), _("Conversations"));
+ gtk_header_bar_set_show_close_button (GTK_HEADER_BAR(header_bar), TRUE);
+
+ image = gtk_image_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON);
+ new_conversation_button = gtk_button_new ();
+ g_signal_connect (new_conversation_button, "clicked",
+ G_CALLBACK (roster_window_chat_new_message_cb), self);
+ gtk_button_set_image (GTK_BUTTON (new_conversation_button), image);
+ gtk_widget_set_tooltip_text (new_conversation_button, _("New Conversation"));
+ gtk_window_set_titlebar (GTK_WINDOW (self), header_bar);
+ gtk_container_add (GTK_CONTAINER (header_bar), new_conversation_button);
+ gtk_widget_show_all (header_bar);
+
gtk_container_add (GTK_CONTAINER (self), self->priv->main_vbox);
gtk_widget_show (self->priv->main_vbox);
projects / empathy.git / blobdiff