# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 997375999 0
# Node ID 66a84ff0445a59baf297d778f43243c36a37fe73
# Parent  a14e8459c2339695c16eb0f87ad19302157863c7
[gaim-migrate @ 2150]
bmiller's continued coolness

committer: Tailor Script <tailor@pidgin.im>

diff -r a14e8459c233 -r 66a84ff0445a src/aim.c
--- a/src/aim.c	Thu Aug 09 16:44:10 2001 +0000
+++ b/src/aim.c	Thu Aug 09 16:53:19 2001 +0000
@@ -395,7 +395,9 @@
 	default:
 		debug_printf("caught signal %d\n", sig);
 		gtkspell_stop();
+#ifdef GAIM_PLUGINS
 		remove_all_plugins();
+#endif
 		if (gtk_main_level())
 			gtk_main_quit();
 		exit(0);
diff -r a14e8459c233 -r 66a84ff0445a src/buddy.c
--- a/src/buddy.c	Thu Aug 09 16:44:10 2001 +0000
+++ b/src/buddy.c	Thu Aug 09 16:53:19 2001 +0000
@@ -1372,10 +1372,10 @@
 	applet = NULL;
 #endif
 
-#ifdef GAIM_PLUGINS
 	/* first we tell those who have requested it we're quitting */
 	plugin_event(event_quit, 0, 0, 0, 0);
 
+#ifdef GAIM_PLUGINS
 	/* then we remove everyone in a mass suicide */
 	remove_all_plugins();
 #endif
diff -r a14e8459c233 -r 66a84ff0445a src/gtkimhtml.c
--- a/src/gtkimhtml.c	Thu Aug 09 16:44:10 2001 +0000
+++ b/src/gtkimhtml.c	Thu Aug 09 16:53:19 2001 +0000
@@ -1637,6 +1637,14 @@
 		    size);
 	font = gdk_font_load (buf);
 
+	if (!font && italics) {
+		g_snprintf (buf, sizeof (buf), "-*-%s-%s-o-*-*-*-%d-*-*-*-*-iso8859-*",
+			    choice,
+			    bold ? "bold" : "medium",
+			    size);
+		font = gdk_font_load (buf);
+	}
+
 	if (!font) {
 		g_snprintf (buf, sizeof (buf), "-*-%s-%s-%c-*-*-*-*-*-*-*-*-iso8859-*",
 			    choice,
@@ -1645,6 +1653,13 @@
 		font = gdk_font_load (buf);
 	}
 
+	if (!font && italics) {
+		g_snprintf (buf, sizeof (buf), "-*-%s-%s-o-*-*-*-*-*-*-*-*-iso8859-*",
+			    choice,
+			    bold ? "bold" : "medium");
+		font = gdk_font_load (buf);
+	}
+
 	if (!font) {
 		g_snprintf (buf, sizeof (buf), "-*-%s-*-%c-*-*-*-*-*-*-*-*-iso8859-*",
 			    choice,
@@ -1674,6 +1689,14 @@
 		font = gdk_font_load (buf);
 	}
 
+	if (!font && italics) {
+		g_snprintf (buf, sizeof (buf), "-*-%s-%s-o-*-*-*-%d-*-*-*-*-*-*",
+			    choice,
+			    bold ? "bold" : "medium",
+			    size);
+		font = gdk_font_load (buf);
+	}
+
 	if (!font) {
 		g_snprintf (buf, sizeof (buf), "-*-%s-%s-%c-*-*-*-*-*-*-*-*-*-*",
 			    choice,
@@ -1683,6 +1706,13 @@
 	}
 
 	if (!font) {
+		g_snprintf (buf, sizeof (buf), "-*-%s-%s-o-*-*-*-*-*-*-*-*-*-*",
+			    choice,
+			    bold ? "bold" : "medium");
+		font = gdk_font_load (buf);
+	}
+
+	if (!font) {
 		g_snprintf (buf, sizeof (buf), "-*-%s-*-%c-*-*-*-*-*-*-*-*-*-*",
 			    choice,
 			    italics ? 'i' : 'r');
@@ -2814,7 +2844,7 @@
 					if (!font->size)
 						font->size = 3;
 					if (!font->face)
-						font->face = g_strdup ("helvetica");
+						font->face = g_strdup (DEFAULT_FONT_NAME);
 				}
 
 				fonts = g_slist_prepend (fonts, font);
diff -r a14e8459c233 -r 66a84ff0445a src/plugins.c
--- a/src/plugins.c	Thu Aug 09 16:44:10 2001 +0000
+++ b/src/plugins.c	Thu Aug 09 16:53:19 2001 +0000
@@ -983,6 +983,7 @@
 }
 
 /* Calls the gaim_plugin_remove function in any loaded plugin that has one */
+#ifdef GAIM_PLUGINS
 void remove_all_plugins()
 {
 	GList *c = plugins;
@@ -997,3 +998,4 @@
 		c = c->next;
 	}
 }
+#endif