Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv31902/src
Modified Files:
dialogs.c sound.c
Log Message:
OSCAR SSI for AIM only, until the ICQ kinks are worked out. Thanks, Mark Doliner.
Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- dialogs.c 2 Mar 2002 04:52:21 -0000 1.302
+++ dialogs.c 3 Mar 2002 02:53:46 -0000 1.303
@@ -1043,8 +1043,6 @@
a->combo = gtk_combo_new();
gtk_combo_set_popdown_strings(GTK_COMBO(a->combo), groups_tree(a->gc));
- if (group != NULL)
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(a->combo)->entry), group);
gtk_table_attach_defaults(GTK_TABLE(table), a->combo, 1, 2, 2, 3);
/* Set up stuff for the account box */
@@ -1070,6 +1068,8 @@
gtk_signal_connect(GTK_OBJECT(add), "clicked", GTK_SIGNAL_FUNC(do_add_buddy), a);
gtk_widget_show_all(a->window);
+ if (group != NULL)
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(a->combo)->entry), group);
}
Index: sound.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/sound.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- sound.c 20 Nov 2001 20:19:43 -0000 1.45
+++ sound.c 3 Mar 2002 02:53:46 -0000 1.46
@@ -398,7 +398,7 @@
else if (pid == 0) {
alarm(30);
if (sound_options & OPT_SOUND_BEEP) {
- g_print("\a");
+ gdk_beep();
_exit(0);
}
@@ -462,7 +462,7 @@
else if (pid == 0) {
alarm(30);
if (sound_options & OPT_SOUND_BEEP) {
- g_print("\a");
+ gdk_beep();
_exit(0);
}
#ifdef ESD_SOUND
|
