changeset 8756:67f733c1cff8

[gaim-migrate @ 9511] marv pointed out that the conversation menu item "Insert Link" wasn't working. This fixes it. I'm also hiding the insert image button and menu item, since they don't work. Although, it seems no one really noticed that the menu item wasn't working... perhaps it should be removed? And Michele says hi! committer: Tailor Script <[e-mail]>

--- a/src/gtkconv.c	Thu Apr 22 04:57:33 2004 +0000
+++ b/src/gtkconv.c	Thu Apr 22 05:15:10 2004 +0000
@@ -717,31 +717,37 @@
 							   gaim_conversation_get_name(conv), NULL);
 }
 
-#if 0
 static void
 menu_insert_link_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	GaimConvWindow *win = (GaimConvWindow *)data;
 	GaimConversation *conv;
 	GaimGtkConversation *gtkconv;
+	GtkIMHtmlToolbar *toolbar;
 
 	conv    = gaim_conv_window_get_active_conversation(win);
 	gtkconv = GAIM_GTK_CONVERSATION(conv);
-
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.link),
-		!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.link)));
+	toolbar = GTK_IMHTMLTOOLBAR(gtkconv->toolbar);
+
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toolbar->link),
+		!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toolbar->link)));
 }
 
+#if 0
 static void
 menu_insert_image_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	GaimConvWindow *win = (GaimConvWindow *)data;
+	GaimConversation *conv;
 	GaimGtkConversation *gtkconv;
-
+	GtkIMHtmlToolbar *toolbar;
+
+	conv    = gaim_conv_window_get_active_conversation(win);
 	gtkconv = GAIM_GTK_CONVERSATION(gaim_conv_window_get_active_conversation(win));
-
-	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.image),
-		!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtkconv->toolbar.image)));
+	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)));
 }
 #endif
 
@@ -2304,7 +2310,8 @@
 		}
 
 		gtk_widget_show(gtkwin->menu.insert_link);
-		gtk_widget_show(gtkwin->menu.insert_image);
+		/* XXX - IMIMAGE - Fix IM images then show this. */
+		gtk_widget_hide(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 */
 
@@ -3177,7 +3184,7 @@
 
 	{ "/Conversation/sep3", NULL, NULL, 0, "<Separator>" },
 
-	{ N_("/Conversation/Insert Lin_k..."), NULL, NULL, 0, /* menu_insert_link_cb, 0, */
+	{ 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, */
 	  "<StockItem>", GAIM_STOCK_IMAGE },

--- a/src/gtkimhtmltoolbar.c	Thu Apr 22 04:57:33 2004 +0000
+++ b/src/gtkimhtmltoolbar.c	Thu Apr 22 05:15:10 2004 +0000
@@ -962,6 +962,9 @@
 	gtk_widget_show(sep);
 	toolbar->sml = NULL;
 	gtk_widget_show_all(hbox);
+
+	/* XXX - IMIMAGE - Fix IM images then remove the following line */
+	gtk_widget_hide(toolbar->image);
 }
 
 GtkWidget *gtk_imhtmltoolbar_new()