diff src/gaim.h @ 338:9d258a0aa560

[gaim-migrate @ 348] Whoa, all kinds of things happened here. The applet looks better. The preferences dialog changes based on your compile-time options (oscar, gnome). Whispering works again. libfaim got updated; it can almost do RVOUS stuff, and hopefully soon can make requests too. The applet doesn't need to have its sounds go through GNOME, although it still can. There is code to facilitate SOCKS5 support (all that needs to be done is to actually write the code to communicate with the proxy server). committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Tue, 06 Jun 2000 09:55:30 +0000
parents f5b199e20d12
children 0d9cfc3579a5
line wrap: on
line diff
--- a/src/gaim.h	Tue Jun 06 09:36:12 2000 +0000
+++ b/src/gaim.h	Tue Jun 06 09:55:30 2000 +0000
@@ -103,10 +103,8 @@
         GtkWidget *aim_port_entry;
         GtkWidget *login_host_entry;
         GtkWidget *login_port_entry;
-        GtkWidget *http_proxy_host_entry;
-        GtkWidget *http_proxy_port_entry;
-        GtkWidget *socks_proxy_host_entry;
-        GtkWidget *socks_proxy_port_entry;
+        GtkWidget *proxy_host_entry;
+        GtkWidget *proxy_port_entry;
 
 };
 
@@ -350,7 +348,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 347 $"
+#define REVISION "gaim:$Revision: 348 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -448,6 +446,7 @@
 #define OPT_SOUND_FIRST_RCV      0x00000010
 #define OPT_SOUND_WHEN_AWAY      0x00000020
 #define OPT_SOUND_SILENT_SIGNON  0x00000040
+#define OPT_SOUND_THROUGH_GNOME  0x00000080
 
 
 extern int font_options;