Mercurial > pidgin.yaz

changeset 9287:2fa81d44ee6f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 10090] Re-add the Conversation->Insert Image doohicky. That's right, I just said doohicky. My grandmother would be proud. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Tue, 15 Jun 2004 04:18:27 +0000
parents 46cfbd17ce3e
children ab845c8e2afe
files src/gtkconv.c src/gtkimhtml.c src/gtkimhtmltoolbar.c src/idle.c
diffstat 4 files changed, 2 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/src/gtkconv.c	Tue Jun 15 03:10:13 2004 +0000
+++ b/src/gtkconv.c	Tue Jun 15 04:18:27 2004 +0000
@@ -960,7 +960,6 @@
 		!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->link)));
 }
 
-#if 0
 static void
 menu_insert_image_cb(gpointer data, guint action, GtkWidget *widget)
 {
@@ -976,7 +975,6 @@
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image),
 		!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->image)));
 }
-#endif
 
 static void
 menu_alias_cb(gpointer data, guint action, GtkWidget *widget)
@@ -2521,8 +2519,7 @@
 		}
 
 		gtk_widget_show(gtkwin->menu.insert_link);
-		/* XXX - IMIMAGE - Fix IM images then show this. */
-		gtk_widget_hide(gtkwin->menu.insert_image);
+		gtk_widget_show(gtkwin->menu.insert_image);
 	} else if (gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
 		/* Show stuff that applies to IMs, hide stuff that applies to chats */
 
@@ -3359,7 +3356,7 @@
 
 	{ N_("/Conversation/Insert Lin_k..."), NULL, menu_insert_link_cb, 0,
 	  "<StockItem>", GAIM_STOCK_LINK },
-	{ N_("/Conversation/Insert Imag_e..."), NULL, NULL, 0, /* menu_insert_image_cb, 0, */
+	{ N_("/Conversation/Insert Imag_e..."), NULL, menu_insert_image_cb, 0,
 	  "<StockItem>", GAIM_STOCK_IMAGE },
 
 	{ "/Conversation/sep4", NULL, NULL, 0, "<Separator>" },
--- a/src/gtkimhtml.c	Tue Jun 15 03:10:13 2004 +0000
+++ b/src/gtkimhtml.c	Tue Jun 15 04:18:27 2004 +0000
@@ -474,17 +474,6 @@
 			return FALSE;
 			break;
 
-#ifdef LAY_OFF_MY_FRIGGIN_KEYBINDINGS
-		case 'f':
-		case 'F':
-			/*set_toggle(gtkconv->toolbar.font,
-			  !gtk_toggle_button_get_active(
-			  GTK_TOGGLE_BUTTON(gtkconv->toolbar.font)));*/
-			
-			return TRUE;
-			break;
-#endif /* this doesn't even DO anything */
-			
 		case 'i':
 		case 'I':
 			if (imhtml->format_functions & GTK_IMHTML_ITALIC) {
--- a/src/gtkimhtmltoolbar.c	Tue Jun 15 03:10:13 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Tue Jun 15 04:18:27 2004 +0000
@@ -433,7 +433,6 @@
 	GtkTextMark *ins;
 
 	if (resp != GTK_RESPONSE_OK) {
-		//set_toggle(toolbar->image, FALSE);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->image), FALSE);
 		return;
 	}
--- a/src/idle.c	Tue Jun 15 03:10:13 2004 +0000
+++ b/src/idle.c	Tue Jun 15 04:18:27 2004 +0000
@@ -37,13 +37,10 @@
 #include "debug.h"
 #include "log.h"
 #include "prefs.h"
-#include "prpl.h"
 #include "signals.h"
 
 #include "ui.h"
 
-#include "gtkprefs.h"
-
 /* XXX For the away stuff */
 #include "gaim.h"