pidgin: src/gtkconv.c comparison

comparison src/gtkconv.c @ 7879:f9df510460d7

[gaim-migrate @ 8533] Some lot of small changes, mostly to conversation menus. -Made the alias menu item in chat convo windows work -Made the add/remove menu items in chat convo windows work. The menu item still doesn't toggle after you've added or removed, but I'll probably do that soon -Made the invite dialog not modal -Removed GAIM_STOCK_PRIVACY from stock.[c|h] since we're not using it anymore committer: Tailor Script <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Sun, 14 Dec 2003 23:59:14 +0000
parents	e873d0bd0e6c
children	c5a4d1863425

comparison

equal deleted inserted replaced

-:cbfbed263d00
+:f9df510460d7
 		return;
 	}
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
 		gaim_conv_im_send(GAIM_CONV_IM(conv), buf);
-	else
+	else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
 		gaim_conv_chat_send(GAIM_CONV_CHAT(conv), buf);
 	if (gaim_prefs_get_bool("/gaim/gtk/conversations/im/hide_on_send"))
 		gaim_conv_window_hide(gaim_conversation_get_window(conv));
 static void
 add_cb(GtkWidget *widget, GaimConversation *conv)
 {
 	GaimAccount *account;
 	const char *name;
-	GaimConversationType type;
 	account = gaim_conversation_get_account(conv);
 	name    = gaim_conversation_get_name(conv);
-	type    = gaim_conversation_get_type(conv);
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
-	if (GAIM_CONV_IM(conv)) {
 		GaimBuddy *b;
 		b = gaim_find_buddy(account, name);
 		if (b != NULL)
 			show_confirm_del(b);
 		else if (account != NULL && gaim_account_is_connected(account))
 			gaim_blist_request_add_buddy(account, (char *)name, NULL, NULL);
-	} else if (GAIM_CONV_CHAT(conv)) {
+	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
 		GaimChat *c;
 		c = gaim_blist_find_chat(account, name);
 		if (c != NULL)
 			show_confirm_del_blist_chat(c);
 {
 	GaimGtkConversation *gtkconv;
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+		serv_get_info(gaim_conversation_get_gc(conv),
+					  gaim_conversation_get_name(conv));
+		gtk_widget_grab_focus(gtkconv->entry);
+	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
+		/* Get info of the person currently selected in the GtkTreeView */
 		GaimGtkChatPane *gtkchat;
 		GtkTreeIter iter;
 		GtkTreeModel *model;
 		GtkTreeSelection *sel;
 		const char *name;
 		if (gtk_tree_selection_get_selected(sel, NULL, &iter))
 			gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 1, &name, -1);
 		else
 			return;
-		serv_get_info(gaim_conversation_get_gc(conv), (char *)name);
+		serv_get_info(gaim_conversation_get_gc(conv), name);
-	}
-	else {
-		serv_get_info(gaim_conversation_get_gc(conv),
-					  (char *)gaim_conversation_get_name(conv));
-		gtk_widget_grab_focus(gtkconv->entry);
 	}
 }
 static void
 warn_cb(GtkWidget *widget, GaimConversation *conv)
 {
 	show_warn_dialog(gaim_conversation_get_gc(conv),
-					 (char *)gaim_conversation_get_name(conv));
+					 gaim_conversation_get_name(conv));
 	gtk_widget_grab_focus(GAIM_GTK_CONVERSATION(conv)->entry);
 }
 static void
 		gtkwin = GAIM_GTK_WINDOW(win);
 		/* Create the new dialog. */
 		invite_dialog = gtk_dialog_new_with_buttons(
 			_("Invite Buddy Into Chat Room"),
-			GTK_WINDOW(gtkwin->window),
+			GTK_WINDOW(gtkwin->window), 0,
-			GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 			GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
 		gtk_dialog_set_default_response(GTK_DIALOG(invite_dialog),
 										GTK_RESPONSE_OK);
 		gtk_container_set_border_width(GTK_CONTAINER(invite_dialog), 6);
 static void
 menu_alias_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	GaimConvWindow *win = (GaimConvWindow *)data;
 	GaimConversation *conv;
-	GaimBuddy *b;
+	GaimAccount *account;
+	const char *name;
-	conv = gaim_conv_window_get_active_conversation(win);
+	conv    = gaim_conv_window_get_active_conversation(win);
-	b = gaim_find_buddy(gaim_conversation_get_account(conv),
+	account = gaim_conversation_get_account(conv);
-						gaim_conversation_get_name(conv));
+	name    = gaim_conversation_get_name(conv);
-	if (b != NULL) {
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+		GaimBuddy *b;
+		b = gaim_find_buddy(account, name);
+		if (b != NULL)
 			alias_dialog_bud(b);
-#if 0
+	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
-		else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
+		GaimChat *c;
-			alias_dialog_chat((struct chat *)b);
-#endif
+		c = gaim_blist_find_chat(account, name);
+		if (c != NULL)
+			alias_dialog_blist_chat(c);
 	}
 }
 static void
 menu_get_info_cb(gpointer data, guint action, GtkWidget *widget)
 	gtkwin  = GAIM_GTK_WINDOW(win);
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 	gaim_conversation_set_unseen(conv, GAIM_UNSEEN_NONE);
-	if (gc != NULL) {
+	if (gc != NULL)
-		gtk_widget_set_sensitive(gtkwin->menu.insert_link, TRUE);
 		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
-	}
 	/* Update the menubar */
 	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
 		gtk_widget_show(gtkwin->menu.view_log);
 		gtk_widget_show(gtkwin->menu.add_pounce);
 		gtk_widget_show(gtkwin->menu.get_info);
 		gtk_widget_hide(gtkwin->menu.invite);
+		gtk_widget_show(gtkwin->menu.insert_link);
 		gtk_widget_show(gtkwin->menu.insert_image);
 		if (gc && prpl_info->options & OPT_PROTO_IM_IMAGE)
 			gtk_widget_set_sensitive(gtkwin->menu.insert_image, TRUE);
 		else
 		gtk_widget_hide(gtkwin->menu.view_log);
 		gtk_widget_hide(gtkwin->menu.add_pounce);
 		gtk_widget_hide(gtkwin->menu.get_info);
 		gtk_widget_show(gtkwin->menu.invite);
+		gtk_widget_show(gtkwin->menu.insert_link);
 		gtk_widget_hide(gtkwin->menu.insert_image);
 		gtk_widget_set_sensitive(gtkconv->toolbar.image, FALSE);
 		gtk_widget_hide(gtkwin->menu.warn);
 		gtk_widget_hide(gtkwin->menu.block);
-		if (gaim_find_chat(gaim_conversation_get_gc(conv),
+		if (gaim_blist_find_chat(gaim_conversation_get_account(conv),
-				   gaim_conv_chat_get_id(GAIM_CONV_CHAT(conv))) == NULL) {
+								 gaim_conversation_get_name(conv)) == NULL) {
 			gtk_widget_show(gtkwin->menu.add);
 			gtk_widget_hide(gtkwin->menu.remove);
 			gtk_widget_set_sensitive(gtkwin->menu.alias, FALSE);
 		} else {
 			gtk_widget_show(gtkwin->menu.remove);
 	gtkwin->menu.add_pounce =
 		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
 									N_("/Conversation/Add Buddy Pounce..."));
+	/* --- */
+	gtkwin->menu.get_info =
+		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
+									N_("/Conversation/Get Info"));
+	gtkwin->menu.warn =
+		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
+									N_("/Conversation/Warn..."));
+	gtkwin->menu.invite =
+		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
+									N_("/Conversation/Invite..."));
+	/* --- */
 	gtkwin->menu.alias =
 		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
 									N_("/Conversation/Alias..."));
-	gtkwin->menu.get_info =
+	gtkwin->menu.block =
 		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
-									N_("/Conversation/Get Info"));
+									N_("/Conversation/Block..."));
-	gtkwin->menu.invite =
+	gtkwin->menu.add =
 		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
-									N_("/Conversation/Invite..."));
+									N_("/Conversation/Add..."));
+	gtkwin->menu.remove =
+		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
+									N_("/Conversation/Remove..."));
 	/* --- */
 	gtkwin->menu.insert_link =
 		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
-									N_("/Conversation/Insert URL..."));
+									N_("/Conversation/Insert Link..."));
 	gtkwin->menu.insert_image =
 		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
 									N_("/Conversation/Insert Image..."));
-	/* --- */
-	gtkwin->menu.warn =
-		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
-									N_("/Conversation/Warn..."));
-	gtkwin->menu.block =
-		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
-									N_("/Conversation/Block..."));
-	gtkwin->menu.add =
-		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
-									N_("/Conversation/Add..."));
-	gtkwin->menu.remove =
-		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
-									N_("/Conversation/Remove..."));
 	/* --- */
 	gtkwin->menu.logging =
 		gtk_item_factory_get_widget(gtkwin->menu.item_factory,
 		gaim_gtkconv_update_font_colors(conv);
 		/* Setup the font face */
 		gaim_gtkconv_update_font_face(conv);
-		if (conv_type == GAIM_CONV_CHAT) {
+		if (conv_type == GAIM_CONV_IM) {
-			gtkconv->u.chat = g_malloc0(sizeof(GaimGtkChatPane));
-			pane = setup_chat_pane(conv);
-		}
-		else if (conv_type == GAIM_CONV_IM) {
 			gtkconv->u.im = g_malloc0(sizeof(GaimGtkImPane));
 			gtkconv->u.im->a_virgin = TRUE;
 			pane = setup_im_pane(conv);
+		}
+		else if (conv_type == GAIM_CONV_CHAT) {
+			gtkconv->u.chat = g_malloc0(sizeof(GaimGtkChatPane));
+			pane = setup_chat_pane(conv);
 		}
 		if (pane == NULL) {
 			if      (conv_type == GAIM_CONV_CHAT) g_free(gtkconv->u.chat);
 			else if (conv_type == GAIM_CONV_IM)   g_free(gtkconv->u.im);

Mercurial > pidgin

comparison src/gtkconv.c @ 7879:f9df510460d7