pidgin.yaz: src/gtkconv.c comparison

comparison src/gtkconv.c @ 11338:17142948653e

[gaim-migrate @ 13551] Change the GAIM_CONV_IM and GAIM_CONV_CHAT enums to GAIM_CONV_TYPE_IM and GAIM_CONV_TYPE_CHAT. This touched A LOT of files. Also combined two oscar header files (one of them was small and dorky). committer: Tailor Script <tailor@pidgin.im>

author	Mark Doliner <mark@kingant.net>
date	Thu, 25 Aug 2005 02:33:44 +0000
parents	772d086e9067
children	ef6e94bdda08

comparison

equal deleted inserted replaced

-:1462b64f8fc9
+:17142948653e
 	/* If there are unread messages then show a warning dialog */
 	for (l = gaim_conv_window_get_conversations(win);
 	     l != NULL; l = l->next)
 	{
 		GaimConversation *conv = l->data;
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM &&
+		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM &&
 		    gaim_conversation_get_unseen(conv) == GAIM_UNSEEN_TEXT)
 		{
 			build_warn_close_dialog(win);
 			gtk_widget_show_all(warn_close_dialog);
 	/* I find that I resize the window when it has a bunch of conversations in it, mostly so that the tab bar
 	 * will fit, but then I don't want new windows taking up the entire screen.  I check to see if there is only one
 	 * conversation in the window.  This way we'll be setting new windows to the size of the last resized new window. */
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 	{
 		if (w == gtkconv->imhtml && (gaim_conv_window_get_conversation_count(win) == 1))
 		{
 			gaim_prefs_set_int("/gaim/gtk/conversations/im/default_width", allocation->width);
 			gaim_prefs_set_int("/gaim/gtk/conversations/im/default_height", allocation->height);
 		}
 		if (w == gtkconv->entry)
 			gaim_prefs_set_int("/gaim/gtk/conversations/im/entry_height", allocation->height);
 	}
-	else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
+	else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
 	{
 		if (w == gtkconv->imhtml && (gaim_conv_window_get_conversation_count(win) == 1))
 		{
 			gaim_prefs_set_int("/gaim/gtk/conversations/chat/default_width", allocation->width);
 			gaim_prefs_set_int("/gaim/gtk/conversations/chat/default_height", allocation->height);
 static GaimCmdRet
 say_command_cb(GaimConversation *conv,
 const char *cmd, char **args, char **error, void *data)
 {
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 		gaim_conv_im_send(GAIM_CONV_IM(conv), args[0]);
-	else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
+	else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
 		gaim_conv_chat_send(GAIM_CONV_CHAT(conv), args[0]);
 	return GAIM_CMD_RET_OK;
 }
 {
 	char *tmp;
 	tmp = g_strdup_printf("/me %s", args[0]);
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 		gaim_conv_im_send(GAIM_CONV_IM(conv), tmp);
-	else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
+	else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
 		gaim_conv_chat_send(GAIM_CONV_CHAT(conv), tmp);
 	g_free(tmp);
 	return GAIM_CMD_RET_OK;
 }
 						GAIM_MESSAGE_NO_LOG, time(NULL));
 				if(error)
 					g_free(error);
 				return TRUE;
 			case GAIM_CMD_STATUS_WRONG_TYPE:
-				if(gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+				if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 					gaim_conversation_write(conv, "", _("That command only works in chats, not IMs."),
 							GAIM_MESSAGE_NO_LOG, time(NULL));
 				else
 					gaim_conversation_write(conv, "", _("That command only works in IMs, not chats."),
 							GAIM_MESSAGE_NO_LOG, time(NULL));
 	account = gaim_conversation_get_account(conv);
 	if (!gaim_account_is_connected(account))
 		return;
-	if ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) &&
+	if ((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) &&
 		gaim_conv_chat_has_left(GAIM_CONV_CHAT(conv)))
 		return;
 	if (check_for_and_do_command(conv)) {
 		gtk_imhtml_clear(GTK_IMHTML(gtkconv->entry));
 		int i;
 		bufs = gtk_imhtml_get_markup_lines(GTK_IMHTML(gtkconv->entry));
 		for (i = 0; bufs[i]; i++) {
 			send_history_add(conv, bufs[i]);
-			if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+			if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 				gaim_conv_im_send(GAIM_CONV_IM(conv), bufs[i]);
-			else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
+			else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
 				gaim_conv_chat_send(GAIM_CONV_CHAT(conv), bufs[i]);
 		}
 		g_strfreev(bufs);
 	} else {
 		send_history_add(conv, buf);
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 			gaim_conv_im_send(GAIM_CONV_IM(conv), buf);
-		else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
+		else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
 			gaim_conv_chat_send(GAIM_CONV_CHAT(conv), buf);
 	}
 	g_free(clean);
 	g_free(buf);
 	GaimConversation *conv = gtkconv->active_conv;
 	account = gaim_conversation_get_account(conv);
 	name    = gaim_conversation_get_name(conv);
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
 		GaimBuddy *b;
 		b = gaim_find_buddy(account, name);
 		if (b != NULL)
 			gaim_gtkdialogs_remove_buddy(b);
 		else if (account != NULL && gaim_account_is_connected(account))
 			gaim_blist_request_add_buddy(account, (char *)name, NULL, NULL);
-	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
+	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 		GaimChat *c;
 		c = gaim_blist_find_chat(account, name);
 		if (c != NULL)
 			gaim_gtkdialogs_remove_chat(c);
 static void
 info_cb(GtkWidget *widget, GaimGtkConversation *gtkconv)
 {
 	GaimConversation *conv = gtkconv->active_conv;
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_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) {
+	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 		/* Get info of the person currently selected in the GtkTreeView */
 		GaimGtkChatPane *gtkchat;
 		GtkTreeIter iter;
 		GtkTreeModel *model;
 		GtkTreeSelection *sel;
 	GaimAccount *account;
 	GSList *buddies, *cur;
 	conv = gaim_conv_window_get_active_conversation(win);
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 		type = GAIM_LOG_IM;
-	else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
+	else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
 		type = GAIM_LOG_CHAT;
 	else
 		return;
 	name = gaim_conversation_get_name(conv);
 menu_send_file_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	GaimConvWindow *win = (GaimConvWindow *)data;
 	GaimConversation *conv = gaim_conv_window_get_active_conversation(win);
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
 		serv_send_file(gaim_conversation_get_gc(conv), gaim_conversation_get_name(conv), NULL);
 	}
 }
 	conv    = gaim_conv_window_get_active_conversation(win);
 	account = gaim_conversation_get_account(conv);
 	name    = gaim_conversation_get_name(conv);
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
 		GaimBuddy *b;
 		b = gaim_find_buddy(account, name);
 		if (b != NULL)
 			gaim_gtkdialogs_alias_buddy(b);
-	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
+	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 		GaimChat *c;
 		c = gaim_blist_find_chat(account, name);
 		if (c != NULL)
 			gaim_gtkdialogs_alias_chat(c);
 	name = gaim_conversation_get_name(conv);
 	g_return_val_if_fail(account != NULL, NULL);
 	g_return_val_if_fail(name != NULL, NULL);
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
 		GaimBuddy *b = gaim_find_buddy(account, name);
 		if (b != NULL) {
 			status = gaim_gtk_blist_get_status_icon((GaimBlistNode*)b,
 				(small_icon ? GAIM_STATUS_ICON_SMALL : GAIM_STATUS_ICON_LARGE));
 		}
 	if (status != NULL)
 		g_object_unref(status);
 	if (gaim_conv_window_get_active_conversation(win) == conv &&
-		(gaim_conversation_get_type(conv) != GAIM_CONV_IM ||
+		(gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM ||
 		 gtkconv->u.im->anim == NULL))
 	{
 		status = get_tab_icon(conv, FALSE);
 		gtk_window_set_icon(GTK_WINDOW(GAIM_GTK_WINDOW(win)->window), status);
 	conv = gaim_conv_window_get_active_conversation(win);
 	if (!conv)
 		return;
-	g_return_if_fail(gaim_conversation_get_type(conv) == GAIM_CONV_IM);
+	g_return_if_fail(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM);
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 	active = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
 	gtkconv->u.im->show_icon = active;
 	 * conversations.  Stuff that Gaim chats support in general should be
 	 * shown for chat conversations.  It doesn't matter whether the PRPL
 	 * supports it or not--that only affects if the button or menu item
 	 * is sensitive or not.
 	 */
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
 		/* Show stuff that applies to IMs, hide stuff that applies to chats */
 		/* Deal with menu items */
 		gtk_widget_show(gtkwin->menu.view_log);
 		gtk_widget_show(gtkwin->menu.send_file);
 		}
 		gtk_widget_show(gtkwin->menu.insert_link);
 		gtk_widget_show(gtkwin->menu.insert_image);
 		gtk_widget_show(gtkwin->menu.show_icon);
-	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
+	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 		/* Show stuff that applies to Chats, hide stuff that applies to IMs */
 		/* Deal with menu items */
 		gtk_widget_show(gtkwin->menu.view_log);
 		gtk_widget_hide(gtkwin->menu.send_file);
 	/*
 	 * Handle graying stuff out based on whether an account is connected
 	 * and what features that account supports.
 	 */
 	if ((gc != NULL) &&
-	   ( (gaim_conversation_get_type(conv) != GAIM_CONV_CHAT) ||
+	   ( (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_CHAT) ||
 	    !gaim_conv_chat_has_left(GAIM_CONV_CHAT(conv)) )) {
 		/* Account is online */
 		/* Deal with the toolbar */
 		if (conv->features & GAIM_CONNECTION_HTML) {
 			buttons = GTK_IMHTML_ALL;    /* Everything on */
 		gtk_widget_set_sensitive(gtkwin->menu.invite, (prpl_info->chat_invite != NULL));
 		gtk_widget_set_sensitive(gtkwin->menu.block, (prpl_info->add_deny != NULL));
 		gtk_widget_set_sensitive(gtkwin->menu.insert_link, (conv->features & GAIM_CONNECTION_HTML));
 		gtk_widget_set_sensitive(gtkwin->menu.insert_image, (prpl_info->options & OPT_PROTO_IM_IMAGE));
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
 			gtk_widget_set_sensitive(gtkwin->menu.add, (prpl_info->add_buddy != NULL));
 			gtk_widget_set_sensitive(gtkwin->menu.remove, (prpl_info->remove_buddy != NULL));
 			gtk_widget_set_sensitive(gtkwin->menu.send_file,
 					(prpl_info->send_file != NULL && (!prpl_info->can_receive_file ||
 					 prpl_info->can_receive_file(gc, gaim_conversation_get_name(conv)))));
 			gtk_widget_set_sensitive(gtkwin->menu.alias,
 					(gaim_find_buddy(account, gaim_conversation_get_name(conv)) != NULL));
-		} else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
+		} else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 			gtk_widget_set_sensitive(gtkwin->menu.add, (prpl_info->join_chat != NULL));
 			gtk_widget_set_sensitive(gtkwin->menu.remove, (prpl_info->join_chat != NULL));
 			gtk_widget_set_sensitive(gtkwin->menu.alias,
 					(gaim_blist_find_chat(account, gaim_conversation_get_name(conv)) != NULL));
 		}
 		/* Deal with chat userlist buttons */
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
+		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
 		{
 			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_im, TRUE);
 			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_ignore, TRUE);
 			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_info, (prpl_info->get_info != NULL));
 		}
 		gtk_widget_set_sensitive(gtkwin->menu.remove, FALSE);
 		gtk_widget_set_sensitive(gtkwin->menu.insert_link, TRUE);
 		gtk_widget_set_sensitive(gtkwin->menu.insert_image, FALSE);
 		/* Deal with chat userlist buttons */
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
+		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
 		{
 			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_im, FALSE);
 			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_ignore, FALSE);
 			gtk_widget_set_sensitive(gtkconv->u.chat->userlist_info, FALSE);
 		}
 	}
 	/*
 	 * Update the window's icon
 	 */
-	if ((gaim_conversation_get_type(conv) == GAIM_CONV_IM) &&
+	if ((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) &&
 		(gtkconv->u.im->anim))
 	{
 		window_icon =
 			gdk_pixbuf_animation_get_static_image(gtkconv->u.im->anim);
 		g_object_ref(window_icon);
 	win = (GaimConvWindow *)user_data;
 	conv = gaim_conv_window_get_active_conversation(win);
 	g_return_if_fail(conv != NULL);
-	if (gaim_conversation_get_type(conv) != GAIM_CONV_IM)
+	if (gaim_conversation_get_type(conv) != GAIM_CONV_TYPE_IM)
 		return;
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 	stop_anim(NULL, gtkconv);
 			gaim_prefs_get_bool("/gaim/gtk/conversations/show_formatting_toolbar"));
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtkwin->menu.show_timestamps),
 				       gtkconv->show_timestamps);
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtkwin->menu.show_icon),
 								       gtkconv->u.im->show_icon);
 	/*
 	 * We pause icons when they are not visible.  If this icon should
 	 * be animated then start it back up again.
 	 */
-	if ((gaim_conversation_get_type(conv) == GAIM_CONV_IM) &&
+	if ((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) &&
 		(gtkconv->u.im->animate))
 		start_anim(NULL, gtkconv);
 	gtk_window_set_title(GTK_WINDOW(gtkwin->window),
 			     gtk_label_get_text(GTK_LABEL(gtkconv->tab_label)));
 	GaimConvIm *im = NULL;
 	GaimConversation *conv = gtkconv->active_conv;
 	gtkwin = GAIM_GTK_WINDOW(gaim_conversation_get_window(conv));
-	if(gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+	if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 		im = GAIM_CONV_IM(conv);
 	if(gtkwin->menu.typing_icon) {
 		gtk_widget_destroy(gtkwin->menu.typing_icon);
 		gtkwin->menu.typing_icon = NULL;
 	word_start = cursor;
 	/* if there's nothing there just return */
 	if (!gtk_text_iter_compare(&cursor, &start_buffer))
-		return (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) ? TRUE : FALSE;
+		return (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) ? TRUE : FALSE;
 	text = gtk_text_buffer_get_text(gtkconv->entry_buffer, &start_buffer,
 									&cursor, FALSE);
 	/* if we're at the end of ": " we need to move back 2 spaces */
 	entered = gtk_text_buffer_get_text(gtkconv->entry_buffer, &word_start,
 									   &cursor, FALSE);
 	if (!g_utf8_strlen(entered, -1)) {
 		g_free(entered);
-		return (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) ? TRUE : FALSE;
+		return (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) ? TRUE : FALSE;
 	}
 	nick_partial = g_malloc(strlen(entered)+1);
 	if (command) {
 		list = gaim_cmd_list(conv);
-	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
+	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 		chat = GAIM_CONV_CHAT(conv);
 		list = gaim_conv_chat_get_users(chat);
 	} else {
 		g_free(nick_partial);
 		g_free(entered);
 	if (!matches) {
 		/* if matches isn't set partials won't be either */
 		g_free(entered);
 		if (command)
 			g_list_free(list);
-		return (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) ? TRUE : FALSE;
+		return (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) ? TRUE : FALSE;
 	}
 	gtk_text_buffer_delete(gtkconv->entry_buffer, &word_start, &cursor);
 	if (!matches->next) {
 		/*
 		 * If we already have an open conversation with this buddy, then
 		 * just move the conv to this window.  Otherwise, create a new
 		 * conv and add it to this window.
 		 */
-		c = gaim_find_conversation_with_account(GAIM_CONV_IM, b->name, b->account);
+		c = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, b->name, b->account);
 		if (c != NULL) {
 			GaimConvWindow *oldwin;
 			oldwin = gaim_conversation_get_window(c);
 			if (oldwin != win) {
 				gaim_conv_window_remove_conversation(oldwin, c);
 				gaim_conv_window_add_conversation(win, c);
 			}
 		} else {
-			c = gaim_conversation_new(GAIM_CONV_IM, b->account, b->name);
+			c = gaim_conversation_new(GAIM_CONV_TYPE_IM, b->account, b->name);
 			gaim_conv_window_add_conversation(win, c);
 		}
 		/* Make this conversation the active conversation */
 		gaim_conv_window_switch_conversation(win, c);
 					_("You are not currently signed on with an account that "
 					  "can add that buddy."), NULL);
 			}
 			else
 			{
-				c = gaim_conversation_new(GAIM_CONV_IM, account, username);
+				c = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, username);
 				gaim_conv_window_add_conversation(win, c);
 			}
 		}
 		if (username != NULL) g_free(username);
 		if (protocol != NULL) g_free(protocol);
 		gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
 	}
 	else if (sd->target == gdk_atom_intern("text/uri-list", FALSE)) {
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 			gaim_dnd_file_manage(sd, gaim_conversation_get_account(conv), gaim_conversation_get_name(conv));
 		gtk_drag_finish(dc, TRUE, (dc->action == GDK_ACTION_MOVE), t);
 	}
 	else
 		gtk_drag_finish(dc, FALSE, FALSE, t);
 		return NULL;
 	cn = (GaimBlistNode *)c;
 	for (b = (GaimBuddy *)cn->child; b; b = (GaimBuddy *) ((GaimBlistNode *)b)->next) {
 		GaimConversation *conv;
-		if ((conv = gaim_find_conversation_with_account(GAIM_CONV_IM, b->name, b->account))) {
+		if ((conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, b->name, b->account))) {
 			if (conv->ui_data)
 				return conv->ui_data;
 		}
 	}
 		gtkconv = (GaimGtkConversation *)conv->ui_data;
 		tab_cont = gtkconv->tab_cont;
 		new_ui = FALSE;
-	} else if (conv_type == GAIM_CONV_IM && (gtkconv = gaim_gtk_conv_find_gtkconv(conv))) {
+	} else if (conv_type == GAIM_CONV_TYPE_IM && (gtkconv = gaim_gtk_conv_find_gtkconv(conv))) {
 		conv->ui_data = gtkconv;
 		gtkconv->active_conv = conv;
 		if (!g_list_find(gtkconv->convs, conv))
 			gtkconv->convs = g_list_prepend(gtkconv->convs, conv);
 		return;
 		/* Setup some initial variables. */
 		gtkconv->sg       = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
 		gtkconv->tooltips = gtk_tooltips_new();
-		if (conv_type == GAIM_CONV_IM) {
+		if (conv_type == GAIM_CONV_TYPE_IM) {
 			gtkconv->u.im = g_malloc0(sizeof(GaimGtkImPane));
 			gtkconv->u.im->a_virgin = TRUE;
 			pane = setup_im_pane(gtkconv);
 		}
-		else if (conv_type == GAIM_CONV_CHAT) {
+		else if (conv_type == GAIM_CONV_TYPE_CHAT) {
 			gtkconv->u.chat = g_malloc0(sizeof(GaimGtkChatPane));
 			pane = setup_chat_pane(gtkconv);
 		}
 		if (pane == NULL) {
-			if      (conv_type == GAIM_CONV_CHAT) g_free(gtkconv->u.chat);
+			if      (conv_type == GAIM_CONV_TYPE_CHAT) g_free(gtkconv->u.chat);
-			else if (conv_type == GAIM_CONV_IM)   g_free(gtkconv->u.im);
+			else if (conv_type == GAIM_CONV_TYPE_IM)   g_free(gtkconv->u.im);
 			g_free(gtkconv);
 			conv->ui_data = NULL;
 			return;
 		gtk_widget_show(gtkconv->close);
 	gtk_widget_show(tabby);
 	gtk_widget_show(menu_tabby);
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 		gaim_gtkconv_update_buddy_icon(conv);
 	/* Add this pane to the conversation's notebook. */
 	gtk_notebook_append_page_menu(GTK_NOTEBOOK(gtkwin->notebook), tab_cont, tabby, menu_tabby);
 	gtk_notebook_set_tab_label_packing(GTK_NOTEBOOK(gtkwin->notebook), tab_cont, TRUE, TRUE, GTK_PACK_START);
 				gaim_prefs_get_bool("/gaim/gtk/conversations/tabs"));
 	}
 	/* If this window is setup with an inactive gc, regenerate the menu. */
-	if (conv_type == GAIM_CONV_IM &&
+	if (conv_type == GAIM_CONV_TYPE_IM &&
 		gaim_conversation_get_gc(conv) == NULL) {
 		generate_send_as_items(win, conv);
 	}
 }
 	gaim_request_close_with_handle(conv);
 	gtk_widget_destroy(gtkconv->tab_cont);
 	g_object_unref(gtkconv->tab_cont);
-	if (gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
+	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
 		if (gtkconv->u.im->icon_timer != 0)
 			g_source_remove(gtkconv->u.im->icon_timer);
 		if (gtkconv->u.im->anim != NULL)
 			g_object_unref(G_OBJECT(gtkconv->u.im->anim));
 		g_free(gtkconv->u.im);
 	}
-	else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
+	else if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 		g_free(gtkconv->u.chat);
 	}
 	gtk_object_sink(GTK_OBJECT(gtkconv->tooltips));
 			   "<B>%s</B></FONT> ",
 			   color, sml_attrib ? sml_attrib : "", mdate, str);
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
+		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 			GtkTextIter start, end;
 			GtkTextTag *buddytag = get_buddy_tag(conv, who);
 			gtk_text_buffer_get_end_iter(
 					GTK_IMHTML(gtkconv->imhtml)->text_buffer,
 	if (type == GAIM_CONV_UPDATE_ACCOUNT)
 	{
 		gaim_conversation_autoset_title(conv);
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 			gaim_gtkconv_update_buddy_icon(conv);
 		gaim_gtkconv_update_buttons_by_protocol(conv);
 		g_timeout_add(0, (GSourceFunc)update_send_as_selection, win);
 		char *title;
 		GaimConvIm *im = NULL;
 		GaimConnection *gc = gaim_conversation_get_gc(conv);
 		char color[8];
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 			im = GAIM_CONV_IM(conv);
-		if (!gc || ((gaim_conversation_get_type(conv) == GAIM_CONV_CHAT)
+		if (!gc || ((gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT)
 		                && gaim_conv_chat_has_left(GAIM_CONV_CHAT(conv))))
 			title = g_strdup_printf("(%s)", gaim_conversation_get_title(conv));
 		else
 			title = g_strdup(gaim_conversation_get_title(conv));
 	GaimBuddyIcon *icon;
 	g_return_if_fail(conv != NULL);
 	g_return_if_fail(GAIM_IS_GTK_CONVERSATION(conv));
-	g_return_if_fail(gaim_conversation_get_type(conv) == GAIM_CONV_IM);
+	g_return_if_fail(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM);
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
 	if (!gtkconv->u.im->show_icon)
 		return;
 	GList *l;
 	for (l = gaim_get_conversations(); l != NULL; l = l->next) {
 		GaimConversation *conv = l->data;
-		if (gaim_conversation_get_type(conv) == GAIM_CONV_IM)
+		if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM)
 			gaim_conversation_foreach(gaim_gtkconv_update_buddy_icon);
 	}
 }
 static void

Mercurial > pidgin.yaz

comparison src/gtkconv.c @ 11338:17142948653e