# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 953794021 0
# Node ID 34db9f24289940fc77bb6fbf401f07a7d724dd99
# Parent  effb8a20de2625873142119230403d93a3e89873
[gaim-migrate @ 19]
Fixed a small problem with au2h and added a gnome patch by
Eric Warmenhoven for GNOME Applet fixes.

committer: Tailor Script <tailor@pidgin.im>

diff -r effb8a20de26 -r 34db9f242899 ChangeLog
--- a/ChangeLog	Thu Mar 23 04:13:40 2000 +0000
+++ b/ChangeLog	Thu Mar 23 06:47:01 2000 +0000
@@ -3,7 +3,10 @@
 version 0.9.12:
 	* Segfault fix for PPC/Alpha/etc machines with log(0)
 	  Thanks to Todd Cohen for this one.
-
+	* Small internal change to the way prefs work
+	* GNOME Applet support works better
+	  (thanks to Eric Warmenhoven for the patch)
+	
 version 0.9.11:
 	* <STRIKE>Strike Tag Support</STRIKE> :-)
 	* Another memory leak fix
diff -r effb8a20de26 -r 34db9f242899 config.cache
--- a/config.cache	Thu Mar 23 04:13:40 2000 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-ac_cv_c_const=${ac_cv_c_const=yes}
-ac_cv_cygwin=${ac_cv_cygwin=no}
-ac_cv_func_atexit=${ac_cv_func_atexit=yes}
-ac_cv_func_socket=${ac_cv_func_socket=yes}
-ac_cv_func_strdup=${ac_cv_func_strdup=yes}
-ac_cv_func_strftime=${ac_cv_func_strftime=yes}
-ac_cv_func_strstr=${ac_cv_func_strstr=yes}
-ac_cv_header_fcntl_h=${ac_cv_header_fcntl_h=yes}
-ac_cv_header_stdc=${ac_cv_header_stdc=yes}
-ac_cv_header_sys_time_h=${ac_cv_header_sys_time_h=yes}
-ac_cv_header_sys_wait_h=${ac_cv_header_sys_wait_h=yes}
-ac_cv_header_unistd_h=${ac_cv_header_unistd_h=yes}
-ac_cv_path_ESD_CONFIG=${ac_cv_path_ESD_CONFIG=/usr/bin/esd-config}
-ac_cv_path_GLIB_CONFIG=${ac_cv_path_GLIB_CONFIG=/usr/bin/glib-config}
-ac_cv_path_GTK_CONFIG=${ac_cv_path_GTK_CONFIG=/usr/bin/gtk-config}
-ac_cv_path_LD=${ac_cv_path_LD=/usr/i386-slackware-linux/bin/ld}
-ac_cv_path_NM=${ac_cv_path_NM='/usr/bin/nm -B'}
-ac_cv_path_install=${ac_cv_path_install='/usr/bin/ginstall -c'}
-ac_cv_prog_CC=${ac_cv_prog_CC=gcc}
-ac_cv_prog_CPP=${ac_cv_prog_CPP='gcc -E'}
-ac_cv_prog_LN_S=${ac_cv_prog_LN_S='ln -s'}
-ac_cv_prog_RANLIB=${ac_cv_prog_RANLIB=ranlib}
-ac_cv_prog_cc_cross=${ac_cv_prog_cc_cross=no}
-ac_cv_prog_cc_g=${ac_cv_prog_cc_g=yes}
-ac_cv_prog_cc_works=${ac_cv_prog_cc_works=yes}
-ac_cv_prog_gcc=${ac_cv_prog_gcc=yes}
-ac_cv_prog_gnu_ld=${ac_cv_prog_gnu_ld=yes}
-ac_cv_prog_make_make_set=${ac_cv_prog_make_make_set=yes}
-ac_cv_struct_tm=${ac_cv_struct_tm=time.h}
-ac_cv_type_signal=${ac_cv_type_signal=void}
diff -r effb8a20de26 -r 34db9f242899 config.status
--- a/config.status	Thu Mar 23 04:13:40 2000 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,232 +0,0 @@
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host akira:
-#
-# ./configure 
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: ./config.status [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running ${CONFIG_SHELL-/bin/sh} ./configure  --no-create --no-recursion"
-    exec ${CONFIG_SHELL-/bin/sh} ./configure  --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "./config.status generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "$ac_cs_usage"; exit 0 ;;
-  *) echo "$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=.
-ac_given_INSTALL="/usr/bin/ginstall -c"
-
-trap 'rm -fr Makefile
-	   src/Makefile
-           sounds/Makefile
-           pixmaps/Makefile
-           libfaim/Makefile
-           doc/Makefile
-           m4/Makefile
-           conftest*; exit 1' 1 2 15
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\&%]/\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
-/^[ 	]*VPATH[ 	]*=[^:]*$/d
-
-s%@SHELL@%/bin/sh%g
-s%@CFLAGS@%-g -O2 -I/usr/local/include -I/opt/include%g
-s%@CPPFLAGS@%%g
-s%@CXXFLAGS@%%g
-s%@FFLAGS@%%g
-s%@DEFS@% -DPACKAGE=\"gaim\" -DVERSION=\"0.9.11\" -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_FCNTL_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DRETSIGTYPE=void -DHAVE_STRFTIME=1 -DHAVE_SOCKET=1 -DHAVE_STRDUP=1 -DHAVE_STRSTR=1 -DHAVE_ATEXIT=1 %g
-s%@LDFLAGS@%%g
-s%@LIBS@%%g
-s%@exec_prefix@%${prefix}%g
-s%@prefix@%/usr/local%g
-s%@program_transform_name@%s,x,x,%g
-s%@bindir@%${exec_prefix}/bin%g
-s%@sbindir@%${exec_prefix}/sbin%g
-s%@libexecdir@%${exec_prefix}/libexec%g
-s%@datadir@%${prefix}/share%g
-s%@sysconfdir@%${prefix}/etc%g
-s%@sharedstatedir@%${prefix}/com%g
-s%@localstatedir@%${prefix}/var%g
-s%@libdir@%${exec_prefix}/lib%g
-s%@includedir@%${prefix}/include%g
-s%@oldincludedir@%/usr/include%g
-s%@infodir@%${prefix}/info%g
-s%@mandir@%${prefix}/man%g
-s%@INSTALL_PROGRAM@%${INSTALL}%g
-s%@INSTALL_SCRIPT@%${INSTALL_PROGRAM}%g
-s%@INSTALL_DATA@%${INSTALL} -m 644%g
-s%@PACKAGE@%gaim%g
-s%@VERSION@%0.9.11%g
-s%@ACLOCAL@%aclocal%g
-s%@AUTOCONF@%autoconf%g
-s%@AUTOMAKE@%automake%g
-s%@AUTOHEADER@%autoheader%g
-s%@MAKEINFO@%makeinfo%g
-s%@SET_MAKE@%%g
-s%@host@%i686-pc-linux-gnu%g
-s%@host_alias@%i686-pc-linux-gnu%g
-s%@host_cpu@%i686%g
-s%@host_vendor@%pc%g
-s%@host_os@%linux-gnu%g
-s%@build@%i686-pc-linux-gnu%g
-s%@build_alias@%i686-pc-linux-gnu%g
-s%@build_cpu@%i686%g
-s%@build_vendor@%pc%g
-s%@build_os@%linux-gnu%g
-s%@RANLIB@%ranlib%g
-s%@CC@%gcc%g
-s%@LD@%/usr/i386-slackware-linux/bin/ld%g
-s%@NM@%/usr/bin/nm -B%g
-s%@LN_S@%ln -s%g
-s%@LIBTOOL@%$(SHELL) $(top_builddir)/libtool%g
-s%@CPP@%gcc -E%g
-s%@GNOME_LIBS@%%g
-s%@GNOMEUI_LIBS@%%g
-s%@GNOMEGNORBA_LIBS@%%g
-s%@GTKXMHTML_LIBS@%%g
-s%@ZVT_LIBS@%%g
-s%@GNOME_LIBDIR@%%g
-s%@GNOME_INCLUDEDIR@%%g
-s%@GNOME_CONFIG@%%g
-s%@ORBIT_CONFIG@%%g
-s%@ORBIT_IDL@%%g
-s%@HAVE_ORBIT_TRUE@%%g
-s%@HAVE_ORBIT_FALSE@%%g
-s%@ORBIT_CFLAGS@%%g
-s%@ORBIT_LIBS@%%g
-s%@HAVE_GNORBA_TRUE@%%g
-s%@HAVE_GNORBA_FALSE@%%g
-s%@GNORBA_CFLAGS@%%g
-s%@GNORBA_LIBS@%%g
-s%@GNOME_APPLETS_LIBS@%%g
-s%@GNOME_CAPPLET_LIBS@%%g
-s%@GTK_CONFIG@%/usr/bin/gtk-config%g
-s%@GTK_CFLAGS@%-I/usr/X11R6/include -I/usr/lib/glib/include%g
-s%@GTK_LIBS@%-L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXext -lX11 -lm%g
-s%@XPM_LIBS@%%g
-s%@PTHREAD_LIB@%%g
-s%@GLIB_CONFIG@%/usr/bin/glib-config%g
-s%@GLIB_CFLAGS@%-I/usr/lib/glib/include%g
-s%@GLIB_LIBS@%-L/usr/lib -lglib%g
-s%@ESD_CONFIG@%/usr/bin/esd-config%g
-s%@ESD_CFLAGS@%%g
-s%@ESD_LIBS@%-L/usr/lib -lesd -laudiofile -lm%g
-s%@GAIM_CFLAGS@%-g -O2 -I/usr/local/include -I/opt/include -I../ -I/usr/X11R6/include -I/usr/lib/glib/include  -DESD_SOUND%g
-s%@GAIM_LIBS@% -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl -lXext -lX11 -lm -L/usr/lib -lesd -laudiofile -lm%g
-s%@GAIM_LDADD@%%g
-s%@LIBFAIM_DO@%%g
-
-CEOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-
-CONFIG_FILES=${CONFIG_FILES-"Makefile
-	   src/Makefile
-           sounds/Makefile
-           pixmaps/Makefile
-           libfaim/Makefile
-           doc/Makefile
-           m4/Makefile
-          "}
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-
-
-exit 0
diff -r effb8a20de26 -r 34db9f242899 sounds/au2h.c
--- a/sounds/au2h.c	Thu Mar 23 04:13:40 2000 +0000
+++ b/sounds/au2h.c	Thu Mar 23 06:47:01 2000 +0000
@@ -37,5 +37,6 @@
 		fprintf(f, "\n");
 	}
 	fprintf(f,"};\n");
+	fclose(f);
 	return 0;
 }
diff -r effb8a20de26 -r 34db9f242899 src/buddy.c
--- a/src/buddy.c	Thu Mar 23 04:13:40 2000 +0000
+++ b/src/buddy.c	Thu Mar 23 06:47:01 2000 +0000
@@ -80,6 +80,9 @@
 	if (blist)
 		gtk_widget_destroy(blist);
 	blist=NULL;
+#ifdef USE_APPLET
+	buddy_created = FALSE;
+#endif
 }
 
 void update_num_groups()
diff -r effb8a20de26 -r 34db9f242899 src/gaim.h
--- a/src/gaim.h	Thu Mar 23 04:13:40 2000 +0000
+++ b/src/gaim.h	Thu Mar 23 06:47:01 2000 +0000
@@ -269,7 +269,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 10 $"
+#define REVISION "gaim:$Revision: 19 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -284,6 +284,7 @@
 
 
 #ifdef USE_APPLET
+extern gboolean buddy_created;
 extern GtkWidget *applet;
 #endif /* USE_APPLET */
 
diff -r effb8a20de26 -r 34db9f242899 src/oscar.c
--- a/src/oscar.c	Thu Mar 23 04:13:40 2000 +0000
+++ b/src/oscar.c	Thu Mar 23 06:47:01 2000 +0000
@@ -309,7 +309,7 @@
 
 		set_login_progress(5, "Logged in.\n");
 #ifdef USE_APPLET
-		if (applet_buddy_auto_show) {
+		if (general_options & OPT_GEN_APP_BUDDY_SOW) {
 			show_buddy_list();
 			refresh_buddy_window();
 		} else {
diff -r effb8a20de26 -r 34db9f242899 src/prefs.c
--- a/src/prefs.c	Thu Mar 23 04:13:40 2000 +0000
+++ b/src/prefs.c	Thu Mar 23 06:47:01 2000 +0000
@@ -369,7 +369,7 @@
 	gaim_button("Log All Conversations", &general_options, OPT_GEN_LOG_ALL, genbox);
 	gaim_button("Strip HTML from log files", &general_options, OPT_GEN_STRIP_HTML, genbox);
 #ifdef USE_APPLET
-	gaim_button("Automatically Show Buddy List", &applet_buddy_auto_show, genbox);
+	gaim_button("Automatically Show Buddy List", &general_options, OPT_GEN_APP_BUDDY_SHOW, genbox);
 #endif
 	gaim_button("Raise windows when message recieved", &general_options, OPT_GEN_POPUP_WINDOWS, genbox);
         gaim_button("Send URLs as links", &general_options, OPT_GEN_SEND_LINKS, genbox);
diff -r effb8a20de26 -r 34db9f242899 src/toc.c
--- a/src/toc.c	Thu Mar 23 04:13:40 2000 +0000
+++ b/src/toc.c	Thu Mar 23 06:47:01 2000 +0000
@@ -146,7 +146,7 @@
 
         
 #ifdef USE_APPLET
- 	if (applet_buddy_auto_show) {
+	if (general_options & OPT_GEN_APP_BUDDY_SHOW) {
                 make_buddy();
                 parse_toc_buddy_list(config);
                 refresh_buddy_window();
@@ -160,6 +160,7 @@
 
        
 	setUserState(online);
+	gtk_widget_hide(mainwindow);
 #else
         gtk_widget_hide(mainwindow);
 	show_buddy_list();
diff -r effb8a20de26 -r 34db9f242899 src/util.c
--- a/src/util.c	Thu Mar 23 04:13:40 2000 +0000
+++ b/src/util.c	Thu Mar 23 06:47:01 2000 +0000
@@ -670,6 +670,7 @@
 	}
 	gdk_window_set_icon(w, NULL, icon_pm, icon_bm);
         gdk_window_set_group(w, mainwindow->window);
+	if (mainwindow) gdk_window_set_group(w, mainwindow->window);
 #endif
 }