[Gaim-commits] CVS: gaim/src gtkdialogs.h,1.9,1.10 gtkimhtmltoolbar.c,1.39,1.40 gtkimhtmltoolbar.h,1.5,1.6

[Tim R. <ma...@us...>]

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

Modified Files:
	gtkdialogs.h gtkimhtmltoolbar.c gtkimhtmltoolbar.h 
Log Message:
I fixed the problem described in patch 1038166 in a slightly different way.
While I was at it I got carried away and made it not show size and stuff
in the dialog. The way I did it is probably very evil, and someone will
probably revert it. Just delete the realize_ function.
But this is HEAD, so we can try it anyway.


Index: gtkdialogs.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkdialogs.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -p -r1.9 -r1.10
--- gtkdialogs.h	10 Sep 2004 04:43:31 -0000	1.9
+++ gtkdialogs.h	19 Oct 2004 04:39:55 -0000	1.10
@@ -58,8 +58,6 @@ void gaim_gtkdialogs_remove_contact(Gaim
 			gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_TYPE_HINT_DIALOG)
 #define GAIM_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)
 
-#define DEFAULT_FONT_FACE "Helvetica"
-
 
 /* this is used for queuing messages received while away. This is really a UI function
  * which is why the struct is here. */

Index: gtkimhtmltoolbar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtmltoolbar.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -p -r1.39 -r1.40
--- gtkimhtmltoolbar.c	10 Oct 2004 16:37:37 -0000	1.39
+++ gtkimhtmltoolbar.c	19 Oct 2004 04:39:55 -0000	1.40
@@ -125,6 +125,18 @@ destroy_toolbar_font(GtkWidget *widget, 
 }
 
 static void
+realize_toolbar_font(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
+{
+	GtkFontSelection *sel;
+
+	sel = GTK_FONT_SELECTION(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->fontsel);
+	gtk_widget_hide_all(gtk_widget_get_parent(sel->size_entry));
+	gtk_widget_show_all(sel->family_list);
+	gtk_widget_show(gtk_widget_get_parent(sel->family_list));
+	gtk_widget_show(gtk_widget_get_parent(gtk_widget_get_parent(sel->family_list)));
+}
+
+static void
 cancel_toolbar_font(GtkWidget *widget, GtkIMHtmlToolbar *toolbar)
 {
 	destroy_toolbar_font(widget, NULL, toolbar);
@@ -164,7 +176,7 @@ toggle_font(GtkWidget *font, GtkIMHtmlTo
 		toolbar->font_dialog = gtk_font_selection_dialog_new(_("Select Font"));
 
 		g_object_set_data(G_OBJECT(toolbar->font_dialog), "gaim_toolbar", toolbar);
-
+		
 		if(fontname) {
 			char fonttif[128];
 			g_snprintf(fonttif, sizeof(fonttif), "%s 12", fontname);
@@ -181,6 +193,8 @@ toggle_font(GtkWidget *font, GtkIMHtmlTo
 						 G_CALLBACK(apply_font), toolbar->font_dialog);
 		g_signal_connect(G_OBJECT(GTK_FONT_SELECTION_DIALOG(toolbar->font_dialog)->cancel_button), "clicked",
 						 G_CALLBACK(cancel_toolbar_font), toolbar);
+		g_signal_connect_after(G_OBJECT(toolbar->font_dialog), "realize",
+						 G_CALLBACK(realize_toolbar_font), toolbar);
 
 		gtk_window_present(GTK_WINDOW(toolbar->font_dialog));
 	} else {

Index: gtkimhtmltoolbar.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtmltoolbar.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- gtkimhtmltoolbar.h	3 Oct 2004 22:59:26 -0000	1.5
+++ gtkimhtmltoolbar.h	19 Oct 2004 04:39:55 -0000	1.6
@@ -30,6 +30,8 @@
 extern "C" {
 #endif
 
+#define DEFAULT_FONT_FACE "Helvetica 12"
+
 #define GTK_TYPE_IMHTMLTOOLBAR            (gtk_imhtmltoolbar_get_type ())
 #define GTK_IMHTMLTOOLBAR(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_IMHTMLTOOLBAR, GtkIMHtmlToolbar))
 #define GTK_IMHTMLTOOLBAR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_IMHTMLTOOLBAR, GtkIMHtmlToolbarClass))