pidgin.yaz: src/gtkroomlist.c comparison

comparison src/gtkroomlist.c @ 12896:82fd52867ffc

[gaim-migrate @ 15249] A patch from Bleeter that "adds a GTK_STOCK_REFRESH for the 'get list' button, remove a redundant cb to a g_free, and adds a 'add room' button to the roomlist dialog". He renamed the button to "Add Chat" after he wrote that description. :) committer: Tailor Script <tailor@pidgin.im>

author	Richard Laager <rlaager@wiktel.com>
date	Tue, 17 Jan 2006 00:04:11 +0000
parents	e856f985a0b9
children	7b8f12aacfa1

comparison

equal deleted inserted replaced

-:a355472257f4
+:82fd52867ffc
 	GtkWidget *progress;
 	GtkWidget *sw;
 	GtkWidget *stop_button;
 	GtkWidget *list_button;
+	GtkWidget *add_button;
 	GtkWidget *join_button;
 	GtkWidget *close_button;
 	GaimAccount *account;
 	GaimRoomlist *roomlist;
 	gtk_container_add(GTK_CONTAINER(dialog->sw), rl->tree);
 	gtk_widget_set_sensitive(dialog->stop_button, TRUE);
 	gtk_widget_set_sensitive(dialog->list_button, FALSE);
+	gtk_widget_set_sensitive(dialog->add_button, FALSE);
 	gtk_widget_set_sensitive(dialog->join_button, FALSE);
 }
 static void stop_button_cb(GtkButton *button, GaimGtkRoomlistDialog *dialog)
 {
 	if (dialog->account_widget)
 		gtk_widget_set_sensitive(dialog->account_widget, TRUE);
 	gtk_widget_set_sensitive(dialog->stop_button, FALSE);
 	gtk_widget_set_sensitive(dialog->list_button, TRUE);
+	gtk_widget_set_sensitive(dialog->add_button, FALSE);
 	gtk_widget_set_sensitive(dialog->join_button, FALSE);
 }
 static void close_button_cb(GtkButton *button, GaimGtkRoomlistDialog *dialog)
 {
 struct _menu_cb_info {
 	GaimRoomlist *list;
 	GaimRoomlistRoom *room;
 };
-static void
-join_button_data_change_cb(gpointer data) {
-	g_free(data);
-}
 static void
 selection_changed_cb(GtkTreeSelection *selection, GaimGtkRoomlist *grl) {
 	GtkTreeIter iter;
 	GValue val;
 		val.g_type = 0;
 		gtk_tree_model_get_value(GTK_TREE_MODEL(grl->model), &iter, ROOM_COLUMN, &val);
 		room = g_value_get_pointer(&val);
 		if (!room || !(room->type & GAIM_ROOMLIST_ROOMTYPE_ROOM)) {
 			gtk_widget_set_sensitive(dialog->join_button, FALSE);
+			gtk_widget_set_sensitive(dialog->add_button, FALSE);
 			return;
 		}
 		info = g_new0(struct _menu_cb_info, 1);
 		info->list = dialog->roomlist;
 		info->room = room;
 		g_object_set_data_full(G_OBJECT(dialog->join_button), "room-info",
-							   info, join_button_data_change_cb);
+							   info, g_free);
+		g_object_set_data(G_OBJECT(dialog->add_button), "room-info", info);
+		gtk_widget_set_sensitive(dialog->add_button, TRUE);
 		gtk_widget_set_sensitive(dialog->join_button, TRUE);
 	} else {
+		gtk_widget_set_sensitive(dialog->add_button, FALSE);
 		gtk_widget_set_sensitive(dialog->join_button, FALSE);
 	}
 }
-static void do_join_cb(GtkWidget *w, struct _menu_cb_info *info)
+static void do_add_room_cb(GtkWidget *w, struct _menu_cb_info *info)
 {
-	gaim_roomlist_room_join(info->list, info->room);
+	gaim_blist_request_add_chat(info->list->account, NULL, NULL, info->room->name);
 }
-static void join_button_cb(GtkButton *button, GaimGtkRoomlistDialog *dialog)
+static void add_room_to_blist_cb(GtkButton *button, GaimGtkRoomlistDialog *dialog)
 {
 	GaimRoomlist *rl = dialog->roomlist;
 	GaimGtkRoomlist *grl = rl->ui_data;
 	struct _menu_cb_info *info;
 	info = (struct _menu_cb_info*)g_object_get_data(G_OBJECT(button), "room-info");
+	if(info != NULL)
+		do_add_room_cb(grl->tree, info);
+}
+static void do_join_cb(GtkWidget *w, struct _menu_cb_info *info)
+{
+	gaim_roomlist_room_join(info->list, info->room);
+}
+static void join_button_cb(GtkButton *button, GaimGtkRoomlistDialog *dialog)
+{
+	GaimRoomlist *rl = dialog->roomlist;
+	GaimGtkRoomlist *grl = rl->ui_data;
+	struct _menu_cb_info *info;
+	info = (struct _menu_cb_info*)g_object_get_data(G_OBJECT(button), "room-info");
 	if(info != NULL)
 		do_join_cb(grl->tree, info);
 }
 static void row_activated_cb(GtkTreeView *tv, GtkTreePath *path, GtkTreeViewColumn *arg2,
 		return FALSE;
 	info.list = list;
 	info.room = room;
 	menu = gtk_menu_new();
 	gaim_new_item_from_stock(menu, _("_Join"), GAIM_STOCK_CHAT,
 		                         G_CALLBACK(do_join_cb), &info, 0, 0, NULL);
+	gaim_new_item_from_stock(menu, _("_Add"), GTK_STOCK_ADD,
+		                         G_CALLBACK(do_add_room_cb), &info, 0, 0, NULL);
 	gtk_widget_show_all(menu);
 	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time);
 	return FALSE;
 	dialog->progress = gtk_progress_bar_new();
 	gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(dialog->progress), 0.1);
 	gtk_box_pack_start(GTK_BOX(vbox2), dialog->progress, FALSE, FALSE, 0);
 	gtk_widget_show(dialog->progress);
 	/* button box */
 	bbox = gtk_hbutton_box_new();
 	gtk_box_set_spacing(GTK_BOX(bbox), GAIM_HIG_BOX_SPACE);
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
 	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, TRUE, 0);
 	                 G_CALLBACK(stop_button_cb), dialog);
 	gtk_widget_set_sensitive(dialog->stop_button, FALSE);
 	gtk_widget_show(dialog->stop_button);
 	/* list button */
-	dialog->list_button = gtk_button_new_with_mnemonic(_("_Get List"));
+	dialog->list_button = gaim_pixbuf_button_from_stock(_("_Get List"), GTK_STOCK_REFRESH,
+	                                                    GAIM_BUTTON_HORIZONTAL);
 	gtk_box_pack_start(GTK_BOX(bbox), dialog->list_button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(dialog->list_button), "clicked",
 	                 G_CALLBACK(list_button_cb), dialog);
 	gtk_widget_show(dialog->list_button);
+	/* add button */
+	dialog->add_button = gaim_pixbuf_button_from_stock(_("_Add Chat"), GTK_STOCK_ADD,
+	                                                    GAIM_BUTTON_HORIZONTAL);
+	gtk_box_pack_start(GTK_BOX(bbox), dialog->add_button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(dialog->add_button), "clicked",
+	                 G_CALLBACK(add_room_to_blist_cb), dialog);
+	gtk_widget_set_sensitive(dialog->add_button, FALSE);
+	gtk_widget_show(dialog->add_button);
 	/* join button */
 	dialog->join_button = gaim_pixbuf_button_from_stock(_("_Join"), GAIM_STOCK_CHAT,
 	                                                    GAIM_BUTTON_HORIZONTAL);
 	gtk_box_pack_start(GTK_BOX(bbox), dialog->join_button, FALSE, FALSE, 0);

Mercurial > pidgin.yaz

comparison src/gtkroomlist.c @ 12896:82fd52867ffc