*
* 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: Xavier Claessens <xclaesse@gmail.com>
* Martyn Russell <martyn@imendio.com>
* Mikael Hallendal <micke@imendio.com>
*/
-#include <config.h>
-
-#include <string.h>
-#include <stdio.h>
+#include "config.h"
+#include "empathy-chatrooms-window.h"
-#include <gtk/gtk.h>
-#include <glib.h>
#include <glib/gi18n.h>
+#include <tp-account-widgets/tpaw-builder.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-
-#include "empathy-chatrooms-window.h"
-#include "empathy-new-chatroom-dialog.h"
+#include "empathy-account-chooser.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
typedef struct {
EmpathyChatroomManager *manager;
GtkWidget *account_chooser;
GtkWidget *treeview;
GtkWidget *button_remove;
- GtkWidget *button_edit;
GtkWidget *button_close;
-
- gint room_column;
} EmpathyChatroomsWindow;
static void chatrooms_window_destroy_cb (GtkWidget *widget,
static void chatrooms_window_model_cell_auto_connect_toggled (GtkCellRendererToggle *cell,
gchar *path_string,
EmpathyChatroomsWindow *window);
-static EmpathyChatroom * chatrooms_window_model_get_selected (EmpathyChatroomsWindow *window);
-static void chatrooms_window_model_action_selected (EmpathyChatroomsWindow *window);
-static void chatrooms_window_row_activated_cb (GtkTreeView *tree_view,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- EmpathyChatroomsWindow *window);
static void chatrooms_window_button_remove_clicked_cb (GtkWidget *widget,
EmpathyChatroomsWindow *window);
-static void chatrooms_window_button_edit_clicked_cb (GtkWidget *widget,
- EmpathyChatroomsWindow *window);
static void chatrooms_window_button_close_clicked_cb (GtkWidget *widget,
EmpathyChatroomsWindow *window);
static void chatrooms_window_chatroom_added_cb (EmpathyChatroomManager *manager,
static EmpathyChatroomsWindow *window = NULL;
GtkBuilder *gui;
gchar *filename;
+ GtkWidget *sw, *toolbar;
+ GtkStyleContext *context;
if (window) {
gtk_window_present (GTK_WINDOW (window->window));
window = g_new0 (EmpathyChatroomsWindow, 1);
filename = empathy_file_lookup ("empathy-chatrooms-window.ui", "src");
- gui = empathy_builder_get_file (filename,
- "chatrooms_window", &window->window,
- "hbox_account", &window->hbox_account,
- "label_account", &window->label_account,
- "treeview", &window->treeview,
- "button_edit", &window->button_edit,
- "button_remove", &window->button_remove,
- "button_close", &window->button_close,
- NULL);
+ gui = tpaw_builder_get_file (filename,
+ "chatrooms_window", &window->window,
+ "hbox_account", &window->hbox_account,
+ "label_account", &window->label_account,
+ "sw_room_list", &sw,
+ "treeview", &window->treeview,
+ "toolbar_remove", &toolbar,
+ "button_remove", &window->button_remove,
+ "button_close", &window->button_close,
+ NULL);
g_free (filename);
- empathy_builder_connect (gui, window,
+ /* join the remove toolbar to the treeview */
+ context = gtk_widget_get_style_context (sw);
+ gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
+ context = gtk_widget_get_style_context (toolbar);
+ gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
+
+ tpaw_builder_connect (gui, window,
"chatrooms_window", "destroy", chatrooms_window_destroy_cb,
"button_remove", "clicked", chatrooms_window_button_remove_clicked_cb,
- "button_edit", "clicked", chatrooms_window_button_edit_clicked_cb,
"button_close", "clicked", chatrooms_window_button_close_clicked_cb,
NULL);
/* Account chooser for chat rooms */
window->account_chooser = empathy_account_chooser_new ();
empathy_account_chooser_set_filter (EMPATHY_ACCOUNT_CHOOSER (window->account_chooser),
- empathy_account_chooser_filter_is_connected,
+ empathy_account_chooser_filter_supports_chatrooms,
NULL);
- g_object_set (window->account_chooser,
+ g_object_set (window->account_chooser,
"has-all-option", TRUE,
NULL);
empathy_account_chooser_set_account (EMPATHY_ACCOUNT_CHOOSER (window->account_chooser), NULL);
/* View */
view = GTK_TREE_VIEW (window->treeview);
- g_signal_connect (view, "row-activated",
- G_CALLBACK (chatrooms_window_row_activated_cb),
- window);
-
/* Store */
store = gtk_list_store_new (COL_COUNT,
G_TYPE_STRING, /* Image */
gtk_tree_view_set_model (view, GTK_TREE_MODEL (store));
- /* Selection */
+ /* Selection */
selection = gtk_tree_view_get_selection (view);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
/* Room */
cell = gtk_cell_renderer_text_new ();
- column = gtk_tree_view_column_new_with_attributes (_("Room"), cell,
- "text", COL_ROOM,
+ column = gtk_tree_view_column_new_with_attributes (_("Room"), cell,
+ "text", COL_ROOM,
NULL);
count = gtk_tree_view_append_column (view, column);
gtk_tree_view_column_set_sort_column_id (column, count - 1);
- window->room_column = count - 1;
/* Chatroom auto connect */
cell = gtk_cell_renderer_toggle_new ();
window);
/* Sort model */
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), 0,
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (model), 0,
GTK_SORT_ASCENDING);
}
GtkTreeModel *model;
GtkListStore *store;
GtkTreeIter iter;
- GtkTreeViewColumn *column;
EmpathyAccountChooser *account_chooser;
- McAccount *account;
+ TpAccount *account;
GList *chatrooms, *l;
view = GTK_TREE_VIEW (window->treeview);
chatrooms = empathy_chatroom_manager_get_chatrooms (window->manager, account);
- /* Sort out columns, we only show the server column for
- * selected protocol types, such as Jabber.
- */
- if (account) {
- column = gtk_tree_view_get_column (view, window->room_column);
- gtk_tree_view_column_set_visible (column, TRUE);
- } else {
- column = gtk_tree_view_get_column (view, window->room_column);
- gtk_tree_view_column_set_visible (column, FALSE);
- }
-
/* Clean out the store */
gtk_list_store_clear (store);
model = gtk_tree_view_get_model (view);
store = GTK_LIST_STORE (model);
- gtk_list_store_append (store, &iter);
- gtk_list_store_set (store, &iter,
+ gtk_list_store_insert_with_values (store, &iter, -1,
COL_NAME, empathy_chatroom_get_name (chatroom),
COL_ROOM, empathy_chatroom_get_room (chatroom),
COL_AUTO_CONNECT, empathy_chatroom_get_auto_connect (chatroom),
g_object_unref (chatroom);
}
-static EmpathyChatroom *
-chatrooms_window_model_get_selected (EmpathyChatroomsWindow *window)
-{
- GtkTreeView *view;
- GtkTreeModel *model;
- GtkTreeSelection *selection;
- GtkTreeIter iter;
- EmpathyChatroom *chatroom = NULL;
-
- view = GTK_TREE_VIEW (window->treeview);
- selection = gtk_tree_view_get_selection (view);
-
- if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
- gtk_tree_model_get (model, &iter, COL_POINTER, &chatroom, -1);
- }
-
- return chatroom;
-}
-
-static void
-chatrooms_window_model_action_selected (EmpathyChatroomsWindow *window)
-{
- EmpathyChatroom *chatroom;
-
- /* FIXME: This is still not implemented since Gossip fork */
- chatroom = chatrooms_window_model_get_selected (window);
- g_object_unref (chatroom);
-}
-
-static void
-chatrooms_window_row_activated_cb (GtkTreeView *tree_view,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- EmpathyChatroomsWindow *window)
-{
- if (GTK_WIDGET_IS_SENSITIVE (window->button_edit)) {
- chatrooms_window_model_action_selected (window);
- }
-}
-
static void
chatrooms_window_button_remove_clicked_cb (GtkWidget *widget,
EmpathyChatroomsWindow *window)
g_object_unref (chatroom);
}
-static void
-chatrooms_window_button_edit_clicked_cb (GtkWidget *widget,
- EmpathyChatroomsWindow *window)
-{
- EmpathyChatroom *chatroom;
-
- /* FIXME: This is still not implemented since Gossip fork */
- chatroom = chatrooms_window_model_get_selected (window);
- g_object_unref (chatroom);
-}
-
static void
chatrooms_window_button_close_clicked_cb (GtkWidget *widget,
EmpathyChatroomsWindow *window)
EmpathyChatroomsWindow *window)
{
EmpathyAccountChooser *account_chooser;
- McAccount *account;
+ TpAccount *account;
account_chooser = EMPATHY_ACCOUNT_CHOOSER (window->account_chooser);
account = empathy_account_chooser_dup_account (account_chooser);
if (!account) {
chatrooms_window_model_add (window, chatroom, FALSE);
} else {
- if (empathy_account_equal (account, empathy_chatroom_get_account (chatroom))) {
+ if (account == empathy_chatroom_get_account (chatroom)) {
chatrooms_window_model_add (window, chatroom, FALSE);
}
projects / empathy.git / blobdiff