# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1030316796 0
# Node ID d40f96a0169b7a49a2f6822c3801a0a62cefdc88
# Parent  bc9c71d748423d334196411214b695de53f7b571
[gaim-migrate @ 3459]
Cool camels use Gaim!  And even cowboys!

Thanks, Etan.

committer: Tailor Script <tailor@pidgin.im>

diff -r bc9c71d74842 -r d40f96a0169b gaim.spec.in
--- a/gaim.spec.in	Sun Aug 25 20:54:37 2002 +0000
+++ b/gaim.spec.in	Sun Aug 25 23:06:36 2002 +0000
@@ -17,7 +17,7 @@
 Source:		%{name}-%{version}.tar.gz
 Packager:	Rob Flynn <rob@marko.net>
 BuildRoot:	/var/tmp/%{name}-%{version}-root
-Requires:	gtk+ >= 1.2.5
+Requires:	gtk+ >= 2.0.0
 
 %description
 Gaim allows you to talk to anyone using a variety of messaging 
@@ -31,38 +31,17 @@
 
 Gaim is NOT affiliated with or endorsed by AOL.
 
-%package applet
-Summary:	A Gnome based multiprotocol instant messaging applet
-Group:		Applications/Internet
-Requires:	gtk+ >= 1.2.5
-
-%description applet
-Gaim allows you to talk to anyone using a variety of messaging 
-protocols, including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, 
-MSN Messenger, Jabber, Gadu-Gadu, Napster, and Zephyr.  These 
-protocols are implemented using a modular, easy to use design.  
-To use a protocol, just load the plugin for it.
-
-Gaim supports many common features of other clients, as well as many 
-unique features, such as perl scripting and C plugins.
-
-The applet sits in your Gnome panel. It has all the same functionality
-as the regular application but takes less desktop space.
-
-Gaim is NOT affiliated with or endorsed by AOL.
-
 %prep
 %setup
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --disable-gnome --disable-artsc
+CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --disable-artsc
 make
 if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi;
 mkdir -p $RPM_BUILD_ROOT%{prefix}
 make prefix=$RPM_BUILD_ROOT%{prefix} install
 make -C src mostlyclean-compile
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --sysconfdir=%{sysconfdir} --enable-distrib --disable-artsc
-make -C src gaim_applet
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT prefix=%{prefix} sysconfdir=%{sysconfdir} install
@@ -77,20 +56,6 @@
 %{prefix}/share/pixmaps/gaim.png
 %{prefix}/share/gnome/apps/Internet/gaim.desktop
 
-
-%files applet
-%defattr(-,root,root)
-%attr(755,root,root) %{prefix}/bin/gaim_applet
-%doc doc/the_penguin.txt doc/CREDITS NEWS COPYING AUTHORS doc/FAQ README ChangeLog plugins/PERL-HOWTO HACKING
-%{prefix}/man/man1/gaim.1.gz
-%{prefix}/lib/gaim/*
-%{prefix}/share/locale/*/*/*
-%{prefix}/share/pixmaps/gaim.png
-%{prefix}/share/pixmaps/gaim/*
-%{prefix}/share/gnome/apps/Internet/gaim.desktop
-%{sysconfdir}/CORBA/servers/*
-%{prefix}/share/applets/Network/*
-
 %clean
 rm -r $RPM_BUILD_ROOT
 
diff -r bc9c71d74842 -r d40f96a0169b src/prefs.c
--- a/src/prefs.c	Sun Aug 25 20:54:37 2002 +0000
+++ b/src/prefs.c	Sun Aug 25 23:06:36 2002 +0000
@@ -1,7 +1,7 @@
 /*
  * gaim
  *
- * Copyright (C) 1998-2002, Mark Spencer <markster@marko.net>
+ * Copyright (C) 2002, Sean Egan <bj91704@binghamton.edu>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -652,6 +652,10 @@
 	return ret;
 }
 
+static void browser_print_option(GtkEntry *entry, void *nullish) {
+	g_snprintf(web_command_new, sizeof(web_command_new), "%s", gtk_entry_get_text(entry));
+}
+
 GtkWidget *browser_page() {
 	GtkWidget *ret;
 	GtkWidget *vbox, *hbox;
@@ -686,6 +690,10 @@
 		gtk_widget_set_sensitive(browser_entry, FALSE);
 	gtk_box_pack_start (GTK_BOX (hbox), browser_entry, FALSE, FALSE, 0);
 
+	gtk_entry_set_text(GTK_ENTRY(browser_entry), web_command_new);
+	gtk_signal_connect(GTK_OBJECT(browser_entry), "changed",
+			   GTK_SIGNAL_FUNC(browser_print_option), NULL);
+
 	vbox = make_frame (ret, _("Browser Options"));
 	gaim_button(_("Open new _window by default"), &misc_options_new, OPT_MISC_BROWSER_POPUP, vbox);
 
@@ -1353,7 +1361,8 @@
 	web_browser_new = web_browser;
 	proxytype_new = proxytype;
 	g_snprintf(sound_cmd_new, sizeof(sound_cmd_new), "%s", sound_cmd);
-	g_snprintf(web_command_new, sizeof(web_command_new), "%s", web_command);
+	g_snprintf(web_command_new, sizeof(web_command_new), "%s", 
+		   web_command ? web_command : "xterm -e lynx \"%%s\"");
 	g_snprintf(fontface_new, sizeof(fontface_new), fontface);
 #if !GTK_CHECK_VERSION(1,3,0)
 	g_snprintf(fontxfld_new, sizeof(fontxfld_new), fontxfld);