comparison src/gtkimhtmltoolbar.c @ 8320:5c6c8d48946f

[gaim-migrate @ 9044] The delete_event signals were all screwed up, causing the smiley dialog to never actually close. Fixed. committer: Tailor Script <[e-mail]>

8319:a2c5537a814b

	}
	gtk_widget_grab_focus(toolbar->imhtml);
}


void close_smiley_dialog(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
{
	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->smiley), FALSE);

	if (toolbar->smiley_dialog) {
		gtk_widget_destroy(toolbar->smiley_dialog);

	char *smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text");
	//GaimPlugin *proto = gaim_find_prpl(gaim_account_get_protocol_id(gaim_conversation_get_account(c)));

	gtk_imhtml_insert_smiley(GTK_IMHTML(toolbar->imhtml), NULL, smiley_text); //proto->info->name, smiley_text);

	close_smiley_dialog(NULL, toolbar);
}


static void add_smiley(GtkIMHtmlToolbar *toolbar, GtkWidget *table, int row, int col, char *filename, char *face)
{

		gtk_widget_show_all(dialog);

		toolbar->smiley_dialog = dialog;

	} else if (toolbar->smiley_dialog) {
		close_smiley_dialog(smiley, toolbar);
	}
	gtk_widget_grab_focus(toolbar->imhtml);
}

enum {

8320:5c6c8d48946f

	}
	gtk_widget_grab_focus(toolbar->imhtml);
}


void close_smiley_dialog(GtkWidget *widget, GdkEvent *event,
						 GtkIMHtmlToolbar *toolbar)
{
	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->smiley), FALSE);

	if (toolbar->smiley_dialog) {
		gtk_widget_destroy(toolbar->smiley_dialog);

	char *smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text");
	//GaimPlugin *proto = gaim_find_prpl(gaim_account_get_protocol_id(gaim_conversation_get_account(c)));

	gtk_imhtml_insert_smiley(GTK_IMHTML(toolbar->imhtml), NULL, smiley_text); //proto->info->name, smiley_text);

	close_smiley_dialog(NULL, NULL, toolbar);
}


static void add_smiley(GtkIMHtmlToolbar *toolbar, GtkWidget *table, int row, int col, char *filename, char *face)
{

		gtk_widget_show_all(dialog);

		toolbar->smiley_dialog = dialog;

	} else if (toolbar->smiley_dialog) {
		close_smiley_dialog(smiley, NULL, toolbar);
	}
	gtk_widget_grab_focus(toolbar->imhtml);
}

enum {