[Gaim-commits] CVS: gaim/src dialogs.c,1.593,1.594 gtkimhtml.c,1.320,1.321 gtkimhtmltoolbar.c,1.22,1.23 gtkimhtml.h,1.77,1.78

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29444

Modified Files:
	dialogs.c gtkimhtml.c gtkimhtmltoolbar.c gtkimhtml.h 
Log Message:
Disable the insert image button on the create away message dialog.

I also made the toolbar grab which format options it should support
when it is attached to the imhtml.  So you can set if the imhtml
should support smileys, images, background colors, etc and THEN
attach the toolbar and the buttons will still be correctly grayed out.


Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.593
retrieving revision 1.594
diff -u -d -p -r1.593 -r1.594
--- dialogs.c	18 Apr 2004 06:22:40 -0000	1.593
+++ dialogs.c	24 Apr 2004 01:43:11 -0000	1.594
@@ -805,6 +805,7 @@ void create_away_mess(GtkWidget *widget,
 
 	ca->text = gtk_imhtml_new(NULL, NULL);
 	gtk_imhtml_set_editable(GTK_IMHTML(ca->text), TRUE);
+	gtk_imhtml_set_format_functions(GTK_IMHTML(ca->text), GTK_IMHTML_ALL ^ GTK_IMHTML_IMAGE);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(ca->text), GTK_WRAP_WORD_CHAR);
 
 	gtk_imhtml_smiley_shortcuts(GTK_IMHTML(ca->text),

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -d -p -r1.320 -r1.321
--- gtkimhtml.c	24 Apr 2004 00:45:58 -0000	1.320
+++ gtkimhtml.c	24 Apr 2004 01:43:11 -0000	1.321
@@ -3096,6 +3096,10 @@ void gtk_imhtml_set_format_functions(Gtk
 	g_object_unref(object);
 }
 
+GtkIMHtmlButtons gtk_imhtml_get_format_functions(GtkIMHtml *imhtml)
+{
+	return imhtml->format_functions;
+}
 
 void gtk_imhtml_get_current_format(GtkIMHtml *imhtml, gboolean *bold,
 								   gboolean *italic, gboolean *underline)

Index: gtkimhtmltoolbar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtmltoolbar.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -p -r1.22 -r1.23
--- gtkimhtmltoolbar.c	24 Apr 2004 00:28:39 -0000	1.22
+++ gtkimhtmltoolbar.c	24 Apr 2004 01:43:11 -0000	1.23
@@ -1017,6 +1017,7 @@ GType gtk_imhtmltoolbar_get_type()
 
 void gtk_imhtmltoolbar_attach(GtkIMHtmlToolbar *toolbar, GtkWidget *imhtml)
 {
+	GtkIMHtmlButtons buttons;
 	gboolean bold, italic, underline;
 
 	g_return_if_fail(toolbar != NULL);
@@ -1031,6 +1032,9 @@ void gtk_imhtmltoolbar_attach(GtkIMHtmlT
 	g_signal_connect(G_OBJECT(imhtml), "format_function_update", G_CALLBACK(update_format_cb), toolbar);
 	g_signal_connect_after(G_OBJECT(GTK_IMHTML(imhtml)->text_buffer), "mark-set", G_CALLBACK(mark_set_cb), toolbar);
 
+	buttons = gtk_imhtml_get_format_functions(GTK_IMHTML(imhtml));
+	update_buttons_cb(imhtml, buttons, toolbar);
+
 	bold = italic = underline = FALSE;
 
 	gtk_imhtml_get_current_format(GTK_IMHTML(imhtml), &bold, &italic, &underline);

Index: gtkimhtml.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -p -r1.77 -r1.78
--- gtkimhtml.h	21 Apr 2004 06:13:49 -0000	1.77
+++ gtkimhtml.h	24 Apr 2004 01:43:11 -0000	1.78
@@ -238,6 +238,7 @@ void gtk_imhtml_search_clear(GtkIMHtml *
 void gtk_imhtml_set_editable(GtkIMHtml *imhtml, gboolean editable);
 void gtk_imhtml_set_whole_buffer_formatting_only(GtkIMHtml *imhtml, gboolean wbfo);
 void gtk_imhtml_set_format_functions(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons);
+GtkIMHtmlButtons gtk_imhtml_get_format_functions(GtkIMHtml *imhtml);
 void gtk_imhtml_get_current_format(GtkIMHtml *imhtml, gboolean *bold, gboolean *italic, gboolean *underline);
 gboolean gtk_imhtml_get_editable(GtkIMHtml *imhtml);
 gboolean gtk_imhtml_toggle_bold(GtkIMHtml *imhtml);