# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 968363755 0
# Node ID b389c4221c89d64c293faf59f070b967dac922ef
# Parent  82673bb41e2f77b371b6d54545a650ac97ac92a3
[gaim-migrate @ 866]
More button fun.

OH yeah, the linkifier knows what https:// is now, also.

committer: Tailor Script <tailor@pidgin.im>

diff -r 82673bb41e2f -r b389c4221c89 src/conversation.c
--- a/src/conversation.c	Thu Sep 07 17:53:35 2000 +0000
+++ b/src/conversation.c	Thu Sep 07 21:55:55 2000 +0000
@@ -1458,6 +1458,15 @@
 	gtk_widget_show(smiley_p);
 	gdk_bitmap_unref(mask);
 
+	fgcolorbtn = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
+					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
+					    NULL, _("Color"), _("Text Color"),
+				 	    _("Color"), fgcolor_p, GTK_SIGNAL_FUNC(toggle_color), c);
+	bgcolorbtn = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
+					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
+					    NULL, _("Color"), _("Background Color"),
+				 	    _("Color"), bgcolor_p, GTK_SIGNAL_FUNC(toggle_color), c);
+
 	bold = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
 						GTK_TOOLBAR_CHILD_TOGGLEBUTTON, NULL,
 						_("Bold"), _("Bold Text"), _("Bold"), bold_p,
@@ -1493,14 +1502,6 @@
 						GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
 					    NULL, _("Link"), _("Insert Link"),
 						_("Link"), link_p, GTK_SIGNAL_FUNC(toggle_link), c);                 
-	fgcolorbtn = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					    NULL, _("Color"), _("Text Color"),
-				 	    _("Color"), fgcolor_p, GTK_SIGNAL_FUNC(toggle_color), c);
-	bgcolorbtn = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
-					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
-					    NULL, _("Color"), _("Background Color"),
-				 	    _("Color"), bgcolor_p, GTK_SIGNAL_FUNC(toggle_color), c);
 	wood = gtk_toolbar_append_element(GTK_TOOLBAR(toolbar),
 					    GTK_TOOLBAR_CHILD_TOGGLEBUTTON,
 					    NULL, _("Logging"), _("Enable logging"),
diff -r 82673bb41e2f -r b389c4221c89 src/util.c
--- a/src/util.c	Thu Sep 07 17:53:35 2000 +0000
+++ b/src/util.c	Thu Sep 07 21:55:55 2000 +0000
@@ -140,7 +140,7 @@
                                 if (!(*c))
                                         break;
                         }
-                } else if (!strncasecmp(c, "http://", 7)) {
+                } else if ( (!strncasecmp(c, "http://", 7) || (!strncasecmp(c, "https://", 8)))) {
                         t = c;
                         while(1) {
                                 if (badchar(*t)) {