pidgin3: comparison pidgin/gtkconv.c

-:7ff782ca5089
+:612b36b49058
 static void
 do_invite(GtkWidget *w, int resp, InviteBuddyInfo *info)
 {
 	const char *buddy, *message;
-	PidginConversation *gtkconv;
+	PurpleConversation *conv;
-	gtkconv = PIDGIN_CONVERSATION(info->conv);
+	conv = info->conv;
 	if (resp == GTK_RESPONSE_OK) {
 		buddy   = gtk_entry_get_text(GTK_ENTRY(info->entry));
 		message = gtk_entry_get_text(GTK_ENTRY(info->message));
 		if (!g_ascii_strcasecmp(buddy, ""))
 			return;
-		serv_chat_invite(purple_conversation_get_gc(info->conv),
+		serv_chat_invite(purple_conversation_get_gc(conv),
-						 purple_conv_chat_get_id(PURPLE_CONV_CHAT(info->conv)),
+						 purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)),
 						 message, buddy);
 	}
 	gtk_widget_destroy(invite_dialog);
 	invite_dialog = NULL;
 {
 	PurpleConversation *conv = gtkconv->active_conv;
 	InviteBuddyInfo *info = NULL;
 	if (invite_dialog == NULL) {
-		PurpleConnection *gc;
 		PidginWindow *gtkwin;
 		GtkWidget *label;
 		GtkWidget *vbox, *hbox;
 		GtkWidget *table;
 		GtkWidget *img;
 		                               gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
 		info = g_new0(InviteBuddyInfo, 1);
 		info->conv = conv;
-		gc        = purple_conversation_get_gc(conv);
 		gtkwin    = pidgin_conv_get_window(gtkconv);
 		/* Create the new dialog. */
 		invite_dialog = gtk_dialog_new_with_buttons(
 			_("Invite Buddy Into Chat Room"),
 static void
 menu_insert_image_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	PidginWindow *win = data;
-	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 	GtkIMHtmlToolbar *toolbar;
 	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
-	conv    = gtkconv->active_conv;
 	toolbar = GTK_IMHTMLTOOLBAR(gtkconv->toolbar);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image),
 			!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->image)));
 }
 static gboolean
 conv_keypress_common(PidginConversation *gtkconv, GdkEventKey *event)
 {
 	PidginWindow *win;
-	PurpleConversation *conv;
 	int curconv;
-	conv     = gtkconv->active_conv;
 	win      = gtkconv->win;
 	curconv = gtk_notebook_get_current_page(GTK_NOTEBOOK(win->notebook));
 	/* clear any tooltips */
 	pidgin_tooltip_destroy();
 }
 static gboolean
 entry_key_press_cb(GtkWidget *entry, GdkEventKey *event, gpointer data)
 {
-	PidginWindow *win;
 	PurpleConversation *conv;
 	PidginConversation *gtkconv;
 	gtkconv  = (PidginConversation *)data;
 	conv     = gtkconv->active_conv;
-	win      = gtkconv->win;
 	if (conv_keypress_common(gtkconv, event))
 		return TRUE;
 	/* If CTRL was held down... */
 static void
 insert_text_cb(GtkTextBuffer *textbuffer, GtkTextIter *position,
 			   gchar *new_text, gint new_text_length, gpointer user_data)
 {
 	PidginConversation *gtkconv = (PidginConversation *)user_data;
-	PurpleConversation *conv;
 	g_return_if_fail(gtkconv != NULL);
-	conv = gtkconv->active_conv;
 	if (!purple_prefs_get_bool("/purple/conversations/im/send_typing"))
 		return;
 	got_typing_keypress(gtkconv, (gtk_text_iter_is_start(position) &&
 redraw_icon(gpointer data)
 {
 	PidginConversation *gtkconv = (PidginConversation *)data;
 	PurpleConversation *conv = gtkconv->active_conv;
 	PurpleAccount *account;
-	PurplePluginProtocolInfo *prpl_info = NULL;
 	GdkPixbuf *buf;
 	GdkPixbuf *scale;
 	gint delay;
 	int scale_width, scale_height;
 	int size;
 	gtkconv = PIDGIN_CONVERSATION(conv);
 	account = purple_conversation_get_account(conv);
-	if(account && account->gc) {
+	if (!(account && account->gc)) {
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
-	} else {
 		gtkconv->u.im->icon_timer = 0;
 		return FALSE;
 	}
 	gdk_pixbuf_animation_iter_advance(gtkconv->u.im->iter, NULL);
 remove_icon(GtkWidget *widget, PidginConversation *gtkconv)
 {
 	GList *children;
 	GtkWidget *event;
 	PurpleConversation *conv = gtkconv->active_conv;
-	PidginWindow *gtkwin;
 	g_return_if_fail(conv != NULL);
 	gtk_widget_set_size_request(gtkconv->u.im->icon_container, -1, BUDDYICON_SIZE_MIN);
 	children = gtk_container_get_children(GTK_CONTAINER(gtkconv->u.im->icon_container));
 	gtkconv->u.im->icon_timer = 0;
 	gtkconv->u.im->icon = NULL;
 	gtkconv->u.im->anim = NULL;
 	gtkconv->u.im->iter = NULL;
 	gtkconv->u.im->show_icon = FALSE;
-	gtkwin = gtkconv->win;
 }
 static void
 saveicon_writefile_cb(void *user_data, const char *filename)
 {
 }
 static void
 update_typing_icon(PidginConversation *gtkconv)
 {
-	PidginWindow *gtkwin;
 	PurpleConvIm *im = NULL;
 	PurpleConversation *conv = gtkconv->active_conv;
 	char *message = NULL;
-	gtkwin = gtkconv->win;
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
 		im = PURPLE_CONV_IM(conv);
 	if (im == NULL)
 pidgin_conv_write_conv(PurpleConversation *conv, const char *name, const char *alias,
 						const char *message, PurpleMessageFlags flags,
 						time_t mtime)
 {
 	PidginConversation *gtkconv;
-	PidginWindow *win;
 	PurpleConnection *gc;
 	PurpleAccount *account;
-	PurplePluginProtocolInfo *prpl_info;
 	int gtk_font_options = 0;
 	int gtk_font_options_all = 0;
 	int max_scrollback_lines;
 	int line_count;
 	char buf2[BUF_LONG];
 	if (tag_count > 100) {
 		char *tmp = displaying;
 		displaying = purple_markup_strip_html(tmp);
 		g_free(tmp);
 	}
-	win = gtkconv->win;
-	prpl_info = gc ? PURPLE_PLUGIN_PROTOCOL_INFO(gc->prpl) : NULL;
 	line_count = gtk_text_buffer_get_line_count(
 			gtk_text_view_get_buffer(GTK_TEXT_VIEW(
 				gtkconv->imhtml)));
 static void
 pidgin_conv_chat_update_user(PurpleConversation *conv, const char *user)
 {
 	PurpleConvChat *chat;
-	PurpleConvChatBuddyFlags flags;
 	PurpleConvChatBuddy *cbuddy;
 	PidginConversation *gtkconv;
 	PidginChatPane *gtkchat;
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 		g_free(alias);
 		return;
 	}
 	g_return_if_fail(alias != NULL);
-	flags = purple_conv_chat_user_get_flags(chat, user);
 	cbuddy = purple_conv_chat_cb_find(chat, user);
 	if (cbuddy)
 		add_chat_buddy_common(conv, cbuddy, NULL);
 	g_free(alias);
 	{
 		char *title;
 		PurpleConvIm *im = NULL;
 		PurpleAccount *account = purple_conversation_get_account(conv);
 	 	PurpleBuddy *buddy = NULL;
-		PurplePresence *p = NULL;
 		char *markup = NULL;
 		AtkObject *accessibility_obj;
 		/* I think this is a little longer than it needs to be but I'm lazy. */
 		char *style;
 			title = g_strdup(purple_conversation_get_title(conv));
 		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) {
 			buddy = purple_find_buddy(account, conv->name);
 			if (buddy) {
-				p = purple_buddy_get_presence(buddy);
 				markup = pidgin_blist_get_name_markup(buddy, FALSE, FALSE);
 			} else {
 				markup = title;
 			}
 		} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
 	GdkPixbuf *scale;
 	int scale_width, scale_height;
 	int size = 0;
 	PurpleAccount *account;
-	PurplePluginProtocolInfo *prpl_info = NULL;
 	PurpleBuddyIcon *icon;
 	g_return_if_fail(conv != NULL);
 	g_return_if_fail(PIDGIN_IS_PIDGIN_CONVERSATION(conv));
 	if (!gtkconv->u.im->show_icon)
 		return;
 	account = purple_conversation_get_account(conv);
-	if(account && account->gc)
-		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
 	/* Remove the current icon stuff */
 	children = gtk_container_get_children(GTK_CONTAINER(gtkconv->u.im->icon_container));
 	if (children) {
 		/* We know there's only one child here. It'd be nice to shortcut to the
 }
 static gboolean
 notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 {
-	gint nb_x, nb_y, x_rel, y_rel;
+	gint nb_x, nb_y;
 	int tab_clicked;
 	GtkWidget *page;
 	GtkWidget *tab;
 	if (e->button == 2 && e->type == GDK_BUTTON_PRESS) {
 	/*
 	* Get the relative position of the press event, with regards to
 	* the position of the notebook.
 	*/
 	gdk_window_get_origin(win->notebook->window, &nb_x, &nb_y);
-	x_rel = e->x_root - nb_x;
-	y_rel = e->y_root - nb_y;
 	/* Reset the min/max x/y */
 	win->drag_min_x = 0;
 	win->drag_min_y = 0;
 	win->drag_max_x = 0;
 	 /* if the window exists, is hidden, we're saving positions, and the
 * position is sane... */
 	if (win && win->window &&
 			!GTK_WIDGET_VISIBLE(win->window) && conv_width != 0) {
+#ifdef _WIN32  /* only override window manager placement on Windows */
 		/* ...check position is on screen... */
 		if (conv_x >= gdk_screen_width())
 			conv_x = gdk_screen_width() - 100;
 		else if (conv_x + conv_width < 0)
 			conv_x = 100;
 			conv_y = gdk_screen_height() - 100;
 		else if (conv_y + conv_height < 0)
 			conv_y = 100;
 		/* ...and move it back. */
-#ifdef _WIN32  /* only override window manager placement on Windows */
 		gtk_window_move(GTK_WINDOW(win->window), conv_x, conv_y);
 #endif
 		gtk_window_resize(GTK_WINDOW(win->window), conv_width, conv_height);
 	}
 }
 	gtk_widget_show(gtkconv->menu_label);
 	gtk_misc_set_alignment(GTK_MISC(gtkconv->menu_label), 0, 0);
 	gtk_widget_show(gtkconv->menu_tabby);
-	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
+	if (conv_type == PURPLE_CONV_TYPE_IM)
 		pidgin_conv_update_buddy_icon(conv);
 	/* Build and set conversations tab */
 	pidgin_conv_tab_pack(win, gtkconv);
 void
 pidgin_conv_window_remove_gtkconv(PidginWindow *win, PidginConversation *gtkconv)
 {
 	unsigned int index;
-	PurpleConversationType conv_type;
-	conv_type = purple_conversation_get_type(gtkconv->active_conv);
 	index = gtk_notebook_page_num(GTK_NOTEBOOK(win->notebook), gtkconv->tab_cont);
 	g_object_ref(gtkconv->tab_cont);
 	gtk_object_sink(GTK_OBJECT(gtkconv->tab_cont));
 * open windows will get a new window.
 */
 static void
 conv_placement_by_group(PidginConversation *conv)
 {
-	PurpleConversationType type;
 	PurpleGroup *group = NULL;
 	GList *wl, *cl;
-	type = purple_conversation_get_type(conv->active_conv);
 	group = conv_get_group(conv);
 	/* Go through the list of IMs and find one with this group. */
 	for (wl = pidgin_conv_windows_get_list(); wl != NULL; wl = wl->next) {
 /* This groups things by account.  Otherwise, the same semantics as above */
 static void
 conv_placement_by_account(PidginConversation *conv)
 {
-	PurpleConversationType type;
 	GList *wins, *convs;
 	PurpleAccount *account;
 	account = purple_conversation_get_account(conv->active_conv);
-	type = purple_conversation_get_type(conv->active_conv);
 	/* Go through the list of IMs and find one with this group. */
 	for (wins = pidgin_conv_windows_get_list(); wins != NULL; wins = wins->next) {
 		PidginWindow *win2;
 		PidginConversation *conv2;

Mercurial > pidgin3 / file comparison

comparison: pidgin/gtkconv.c

pidgin/gtkconv.c