ayttm-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Ayttm-commits] CVS: ayttm/src chat_room.c,1.12,1.13 chat_window.c,1.13


From: Andy Maloney <address@hidden>
Subject: [Ayttm-commits] CVS: ayttm/src chat_room.c,1.12,1.13 chat_window.c,1.13,1.14 globals.h,1.3,1.4 prefs.c,1.8,1.9
Date: Fri, 10 Jan 2003 07:37:15 -0500

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv7483/src

Modified Files:
        chat_room.c chat_window.c globals.h prefs.c 
Log Message:
Use pref functions to access prefs


Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- chat_room.c 10 Jan 2003 12:25:32 -0000      1.12
+++ chat_room.c 10 Jan 2003 12:37:13 -0000      1.13
@@ -637,6 +637,9 @@
        GtkWidget * close_button;
        GtkWidget * separator;
        GtkWidget * entry_box;
+       gboolean        enableSoundButton = FALSE;
+
+
        /*if we are already here, just leave*/
        if(chat_room->connected)
                return;
@@ -798,19 +801,26 @@
                                                chat_room);
   /*Toggle the sound button based on preferences*/
 
-       if (do_play_send)
-               chat_room->send_enabled=TRUE;
+       /* Toggle the sound button based on preferences */
+       if ( iGetLocalPref("do_play_send") )
+       {
+               chat_room->send_enabled = TRUE;
+               enableSoundButton = TRUE;
+       }
 
-       if (do_play_receive)
+       if ( iGetLocalPref("do_play_receive") )
+       {
                chat_room->receive_enabled = TRUE;
+               enableSoundButton = TRUE;
+       }
 
-       if (do_play_first)
+       if ( iGetLocalPref("do_play_first") )
+       {
                chat_room->first_enabled = TRUE;
+               enableSoundButton = TRUE;
+       }
 
-       if (do_play_send + do_play_receive + do_play_first > 0)
-               gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sound_button), 
TRUE);
-       else
-               gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(sound_button), 
FALSE);
+       gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON( sound_button ), 
enableSoundButton );
 
        icon = gdk_pixmap_create_from_xpm_d(chat_room->window->window, &mask, 
NULL, tb_mail_send_xpm);
        iconwid = gtk_pixmap_new(icon, mask);

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- chat_window.c       10 Jan 2003 12:25:32 -0000      1.13
+++ chat_window.c       10 Jan 2003 12:37:13 -0000      1.14
@@ -1234,6 +1234,8 @@
   chat_window *tab_cw;
   GtkPositionType pos;
   GtkWidget *contact_label;
+  gboolean     enableSoundButton = FALSE;
+
   smiley_callback_data * scd = g_new0(smiley_callback_data,1);
   scd->c_window = NULL;
   scd->c_room = NULL;
@@ -1613,21 +1615,26 @@
                                                cw);
   gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
    
-  /*Toggle the sound button based on preferences*/
-
-  if (do_play_send)
-    cw->send_enabled=TRUE;
+       /* Toggle the sound button based on preferences */
+       if ( iGetLocalPref("do_play_send") )
+       {
+               cw->send_enabled = TRUE;
+               enableSoundButton = TRUE;
+       }
 
-  if (do_play_receive)
-    cw->receive_enabled = TRUE;
+       if ( iGetLocalPref("do_play_receive") )
+       {
+               cw->receive_enabled = TRUE;
+               enableSoundButton = TRUE;
+       }
 
-  if (do_play_first)
-    cw->first_enabled = TRUE;
+       if ( iGetLocalPref("do_play_first") )
+       {
+               cw->first_enabled = TRUE;
+               enableSoundButton = TRUE;
+       }
 
-  if (do_play_send + do_play_receive + do_play_first > 0)
-    gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(cw->sound_button), TRUE);
-  else
-    gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(cw->sound_button), FALSE);
+       gtk_toggle_button_set_state( GTK_TOGGLE_BUTTON( cw->sound_button ), 
enableSoundButton );
 
   /*Create the separator for the toolbar*/
 

Index: globals.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/globals.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- globals.h   1 Jan 2003 17:32:43 -0000       1.3
+++ globals.h   10 Jan 2003 12:37:13 -0000      1.4
@@ -24,7 +24,6 @@
  *
  */
 
-
 #include <gtk/gtk.h>
 #if defined(__MINGW32__) && defined(__IN_PLUGIN__)
 #define extern __declspec(dllimport)
@@ -39,16 +38,11 @@
 extern gint do_applet_show_on_startup;
 extern gint do_logging;
 extern gint do_strip_html;
-extern gint do_play_sounds;
-extern gint do_play_send;
-extern gint do_play_receive;
-extern gint do_play_first;
 extern gint do_ignore_unknown;
 extern gint do_send_idle_time;
 extern gint is_away;
 extern gint do_raise_window;
 extern gint do_timestamp;
-extern gint do_online_sound;
 extern gint do_multi_line;
 extern gint do_enter_send;
 extern gint do_ignore_fore;
@@ -59,20 +53,6 @@
 extern gint do_send_typing_notify;
 extern gint do_escape_close;
 extern gint do_restore_last_conv;
-extern gint do_no_sound_when_away;
-extern gint do_no_sound_for_ignore;
-
-//extern gchar *DefaultSoundPath;
-//extern gint use_typical_sound_method;
-//extern gint use_sounddevice;
-extern gint do_away_sound;
-extern gchar BuddyArriveFilename[1024];
-extern gchar BuddyAwayFilename[1024];
-extern gchar BuddyLeaveFilename[1024];
-extern gchar SendFilename[1024];
-extern gchar ReceiveFilename[1024];
-extern gchar FirstMsgFilename[1024];
-extern gfloat volume_sound;
 
 extern GtkWidget *away_menu;
 char geometry[256];

Index: prefs.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- prefs.c     4 Jan 2003 13:59:27 -0000       1.8
+++ prefs.c     10 Jan 2003 12:37:13 -0000      1.9
@@ -24,7 +24,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
@@ -62,15 +61,15 @@
  * Preferences Dialog
  */
 
-void build_general_prefs(GtkWidget *); /* Sat Apr 28 2001 S. K. Mandal*/
-void build_sound_tab(GtkWidget *);
-void build_sound_prefs(GtkWidget *);
-void build_logs_prefs(GtkWidget *);
-void build_proxy_prefs(GtkWidget *);
-void build_layout_prefs(GtkWidget *);
-void build_chat_prefs(GtkWidget *);
-void build_encoding_prefs(GtkWidget *);
-void build_modules_prefs(GtkWidget *);
+static void build_general_prefs(GtkWidget *); /* Sat Apr 28 2001 S. K. Mandal*/
+static void build_sound_tab(GtkWidget *);
+static void build_sound_prefs(GtkWidget *);
+static void build_logs_prefs(GtkWidget *);
+static void build_proxy_prefs(GtkWidget *);
+static void build_layout_prefs(GtkWidget *);
+static void build_chat_prefs(GtkWidget *);
+static void build_encoding_prefs(GtkWidget *);
+static void build_modules_prefs(GtkWidget *);
 static void ok_callback(GtkWidget * widget, gpointer data);
 static void cancel_callback(GtkWidget * widget, gpointer data);
 static void destroy(GtkWidget * widget, gpointer data);
@@ -222,12 +221,12 @@
 static GtkWidget * length_contact_window_entry = NULL;
 static GtkWidget * font_size_entry = NULL;
 static GtkWidget * alternate_browser_entry = NULL;
-const gint length_contact_window_def = 256;
-const gint width_contact_window_def = 150;
+static const gint length_contact_window_def = 256;
+static const gint width_contact_window_def = 150;
 #ifdef HAVE_LIBXFT
-const gint font_size_def = 5;
+static const gint font_size_def = 5;
 #else
-const gint font_size_def = 2;
+static const gint font_size_def = 2;
 #endif
 gint length_contact_window_old = 0;
 
@@ -259,7 +258,7 @@
 
 void set_use_alternate_browser(GtkWidget * w, int * data);
 
-void build_general_prefs(GtkWidget *prefs_note) {
+static void build_general_prefs(GtkWidget *prefs_note) {
     GtkWidget *vbox;
     GtkWidget *brbutton;
     GtkWidget *label;
@@ -422,7 +421,7 @@
 gint do_restore_last_conv = 0;
 gint do_restore_last_conv_old = 0;
 
-void build_logs_prefs(GtkWidget *prefs_note)
+static void build_logs_prefs(GtkWidget *prefs_note)
 {
      GtkWidget *vbox = gtk_vbox_new(FALSE, 5);
 
@@ -437,7 +436,7 @@
      gtk_notebook_append_page(GTK_NOTEBOOK(prefs_note), vbox, 
gtk_label_new(_("Logs")));
 }
 
-void cancel_logs_prefs() 
+static void cancel_logs_prefs()
 {
      /* Values */
      do_logging = do_logging_old;
@@ -445,7 +444,7 @@
      do_restore_last_conv = do_restore_last_conv_old;
 }
 
-void write_logs_prefs(FILE *fp)
+static void write_logs_prefs(FILE *fp)
 {
      fprintf(fp,"do_logging=%d\n", do_logging);
      fprintf(fp,"do_strip_html=%d\n", do_strip_html);
@@ -606,7 +605,7 @@
      gtk_widget_show(hbox);
 }
 ////////////////////////////////
-void build_layout_prefs(GtkWidget *prefs_note) 
+static void build_layout_prefs(GtkWidget *prefs_note) 
 {
      GtkWidget *vbox;
      GtkWidget *hbox;
@@ -655,24 +654,24 @@
      gtk_notebook_append_page(GTK_NOTEBOOK(prefs_note), vbox, 
gtk_label_new(_("Layout")));
 }
 
-void cancel_layout_prefs()
+static void cancel_layout_prefs()
 {
      do_tabbed_chat = do_tabbed_chat_old;
      do_tabbed_chat_orient = do_tabbed_chat_orient_old;
 }
 
-void write_layout_prefs(FILE *fp)
+static void write_layout_prefs(FILE *fp)
 {
      fprintf(fp,"do_tabbed_chat=%d\n", do_tabbed_chat);
      fprintf(fp,"do_tabbed_chat_orient=%d\n", do_tabbed_chat_orient);
      iSetLocalPref("do_tabbed_chat_orient",do_tabbed_chat_orient);
 }
 
-void destroy_layout_prefs (void) {
+static void destroy_layout_prefs (void) {
 }
 
 ////////////////////////////////
-void build_chat_prefs(GtkWidget *prefs_note) 
+static void build_chat_prefs(GtkWidget *prefs_note)
 {
      GtkWidget *vbox;
      GtkWidget *hbox;
@@ -743,7 +742,7 @@
      gtk_notebook_append_page(GTK_NOTEBOOK(prefs_note), vbox, 
gtk_label_new(_("Chat")));
 }
 
-void cancel_chat_prefs()
+static void cancel_chat_prefs()
 {
      do_ignore_unknown = do_ignore_unknown_old;
      do_send_idle_time = do_send_idle_time_old;
@@ -765,7 +764,7 @@
         accel_prev_tab = accel_prev_tab_old;
 }
 
-void write_chat_prefs(FILE *fp)
+static void write_chat_prefs(FILE *fp)
 {
        char *ptr=NULL;
      fprintf(fp,"do_ignore_unknown=%d\n", do_ignore_unknown);
@@ -803,7 +802,7 @@
         g_free(ptr);
 }
 
-void destroy_chat_prefs (void) {
+static void destroy_chat_prefs (void) {
        gtk_widget_destroy(font_size_entry);
        font_size_entry=NULL;
 }
@@ -820,7 +819,7 @@
 
 static void set_proxy_type(GtkWidget *w, int *data);
 
-void build_proxy_prefs(GtkWidget *prefs_note)
+static void build_proxy_prefs(GtkWidget *prefs_note)
 {
      GtkWidget *label;
      GtkWidget *button;
@@ -1006,7 +1005,7 @@
 
 }
 
-void destroy_proxy()
+static void destroy_proxy()
 {
        if(proxy_server_entry == NULL) return;
      proxy_set_proxy(new_proxy_type,
@@ -1026,7 +1025,7 @@
        proxy_password_entry=NULL;
 }
 
-void write_proxy_prefs(FILE *fp)
+static void write_proxy_prefs(FILE *fp)
 {
      fprintf(fp,"proxy_type=%d\n", proxy_type);
      if(proxy_host)
@@ -1075,10 +1074,10 @@
 static GtkWidget * local_encoding_entry = NULL;
 static GtkWidget * remote_encoding_entry = NULL;
 
-void set_use_of_recoding(GtkWidget * w, int * data);
+static void set_use_of_recoding(GtkWidget * w, int * data);
 
 /* Encoding conversion Configuration tabs */
-void build_encoding_prefs(GtkWidget * prefs_note)
+static void build_encoding_prefs(GtkWidget * prefs_note)
 {
      GtkWidget * hbox;
      GtkWidget * label;
@@ -1131,7 +1130,7 @@
 
 }
 
-void destroy_encodings() 
+static void destroy_encodings()
 {
      if(local_encoding_entry==NULL) return;
      cSetLocalPref("local_encoding", 
gtk_entry_get_text(GTK_ENTRY(local_encoding_entry)));
@@ -1143,7 +1142,7 @@
 
 }
 
-void set_use_of_recoding(GtkWidget * w, int * data)
+static void set_use_of_recoding(GtkWidget * w, int * data)
 {
      //new_proxy_type = (int)data;
      if(use_recoding == 0)
@@ -1158,7 +1157,7 @@
      }
 }
 
-void write_encoding_prefs(FILE *fp)
+static void write_encoding_prefs(FILE *fp)
 {
         char *enc=NULL;
 
@@ -1517,7 +1516,7 @@
        }
 }
 
-void build_modules_prefs(GtkWidget * prefs_note)
+static void build_modules_prefs(GtkWidget * prefs_note)
 {
        GtkWidget * hbox;
        GtkWidget * label;
@@ -1609,7 +1608,7 @@
        gtk_widget_show(GTK_WIDGET(module_list));
 }
 
-void destroy_modules() 
+static void destroy_modules()
 {
        char *modules_path=NULL;
        char *ptr=NULL;
@@ -1624,7 +1623,7 @@
      modules_path_text=NULL;
 }
 
-void write_module_prefs(FILE *fp)
+static void write_module_prefs(FILE *fp)
 {
        GList *plugins=NULL;
        GList *master_prefs=NULL;
@@ -1653,7 +1652,7 @@
        fprintf(fp,"end\n");
 }
 
-gint compare_ptr_key(gconstpointer a, gconstpointer b) {
+static gint compare_ptr_key(gconstpointer a, gconstpointer b) {
                if(!strcmp( ((ptr_list *)a)->key, (char *)b))
                        return(0);
                return(1);
@@ -1701,7 +1700,7 @@
        char newkey[MAX_PREF_NAME_LEN];
        char *oldvalue=NULL;
 
-       sprintf(newkey, "Local::%s", key);
+       g_snprintf(newkey, MAX_PREF_NAME_LEN, "Local::%s", key);
        oldvalue = SetPref(newkey, strdup(data));
        if(oldvalue)
                g_free(oldvalue);
@@ -1709,11 +1708,7 @@
 }
 
 void iSetLocalPref(char *key, int data) {
-#ifdef __MINGW32__
        char value[MAX_PREF_LEN];
-#else
-       char value[MAX_PREF_NAME_LEN];
-#endif
 
        g_snprintf(value, MAX_PREF_LEN, "%i", data);
        cSetLocalPref(key, value);
@@ -1732,7 +1727,7 @@
        char newkey[MAX_PREF_NAME_LEN];
        char *value=NULL;
 
-       sprintf(newkey, "Local::%s", key);
+       g_snprintf( newkey, MAX_PREF_NAME_LEN, "Local::%s", key );
        value = (char *)GetPref(newkey);
        if(!value)
                value="";
@@ -1757,37 +1752,32 @@
  * Sound Preferences Dialog
  */
 
-//gchar *sounddevice_old = "/dev/audio"; //defaults at "/dev/audio"
-//gint use_sounddevice_old = 0;
-//gint use_typical_sound_method_old = 0;
-gint do_away_sound = 1;
-gint do_away_sound_old = 1;
-gint do_no_sound_when_away = 0;
-gint do_no_sound_when_away_old = 0;
-gint do_no_sound_for_ignore = 1;
-gint do_no_sound_for_ignore_old = 1;
-gint do_online_sound = 1;
-gint do_online_sound_old = 1;
-gint do_play_send = 1;
-gint do_play_send_old = 1;
-gint do_play_first = 1;
-gint do_play_first_old = 1;
-gint do_play_receive = 1;
-gint do_play_receive_old = 1;
-
-// todo: allocate these 14KB of buffers dynamically
-//gchar *sounddevice = "/dev/audio"; //defaults at "/dev/audio"
-//gint use_sounddevice = 0;
-//gint use_typical_sound_method = 0;
-
-gchar BuddyArriveFilename_old[1024] = BuddyArriveDefault;
-gchar BuddyAwayFilename_old[1024] = BuddyLeaveDefault;
-gchar BuddyLeaveFilename_old[1024] = BuddyLeaveDefault;
-gchar FirstMsgFilename_old[1024] = ReceiveDefault;
-gchar ReceiveFilename_old[1024] = ReceiveDefault;
-gchar SendFilename_old[1024] = SendDefault;
+gint           do_no_sound_when_away = 0;
+static gint    do_no_sound_when_away_old = 0;
+
+gint           do_no_sound_for_ignore = 1;
+static gint    do_no_sound_for_ignore_old = 1;
+
+gint           do_online_sound = 1;
+static gint    do_online_sound_old = 1;
 
-gfloat volume_sound_old = 0;
+gint           do_play_send = 1;
+static gint do_play_send_old = 1;
+
+gint           do_play_first = 1;
+static gint    do_play_first_old = 1;
+
+gint           do_play_receive = 1;
+static gint    do_play_receive_old = 1;
+
+static gchar BuddyArriveFilename_old[1024] = BuddyArriveDefault;
+static gchar BuddyAwayFilename_old[1024] = BuddyLeaveDefault;
+static gchar BuddyLeaveFilename_old[1024] = BuddyLeaveDefault;
+static gchar FirstMsgFilename_old[1024] = ReceiveDefault;
+static gchar ReceiveFilename_old[1024] = ReceiveDefault;
+static gchar SendFilename_old[1024] = SendDefault;
+
+static gfloat volume_sound_old = 0;
 
 static GtkWidget *arrivesoundentry=NULL;
 static GtkWidget *awaysoundentry=NULL;
@@ -1797,11 +1787,11 @@
 static GtkWidget *firstmsgsoundentry=NULL;
 static GtkWidget *volumesoundentry=NULL;
 
-GtkWidget *add_sound_file_selection_box(gchar *, GtkWidget *, gchar *, int);
-GtkWidget *add_sound_volume_selection_box(gchar *, GtkWidget *, GtkAdjustment 
*);
+static GtkWidget *add_sound_file_selection_box(gchar *, GtkWidget *, gchar *, 
int);
+static GtkWidget *add_sound_volume_selection_box(gchar *, GtkWidget *, 
GtkAdjustment *);
 /* Main Sound Preferences Funtion, hooks in the rest */
 
-void build_sound_prefs(GtkWidget *prefs_note) 
+static void build_sound_prefs(GtkWidget *prefs_note)
 {
      GtkWidget *vbox = gtk_vbox_new(FALSE, 5);
      build_sound_tab(vbox);
@@ -1814,7 +1804,7 @@
 
      /* This is the sound sub-tabs code */
 
-void build_sound_tab(GtkWidget * parent_window)
+static void build_sound_tab(GtkWidget * parent_window)
 {
 
      GtkWidget * sound_vbox;
@@ -1829,9 +1819,6 @@
      do_play_send_old = do_play_send;
      do_play_first_old = do_play_first;
      do_play_receive_old = do_play_receive;
-//     use_typical_sound_method_old = use_typical_sound_method;
-//     use_sounddevice_old = use_sounddevice;
-//     sounddevice_old = sounddevice;
      strcpy(BuddyArriveFilename_old, cGetLocalPref("BuddyArriveFilename"));
      strcpy(BuddyAwayFilename_old, cGetLocalPref("BuddyAwayFilename"));
      strcpy(BuddyLeaveFilename_old, cGetLocalPref("BuddyLeaveFilename"));
@@ -1847,7 +1834,6 @@
 
      eb_button(_("Disable sounds when away"), &do_no_sound_when_away, 
sound_vbox);
      eb_button(_("Disable sounds for Ignored people"), 
&do_no_sound_for_ignore, sound_vbox);
-     eb_button(_("Enable sounds when sending to a person that is 
away"),&do_away_sound, sound_vbox);
      eb_button(_("Play sounds when signing on or off"), &do_online_sound, 
sound_vbox);
      eb_button(_("Play a sound when sending a message"), &do_play_send, 
sound_vbox);
      eb_button(_("Play a sound when receiving a message"), &do_play_receive, 
sound_vbox);
@@ -1909,19 +1895,15 @@
 
 }
 
-void cancel_sound_prefs()
+static void cancel_sound_prefs()
 {
      /* Values */
-//     use_typical_sound_method = use_typical_sound_method_old;
-//     use_sounddevice = use_sounddevice_old;
-//     sounddevice = sounddevice_old;
      do_play_send = do_play_send_old;
      do_play_first = do_play_first_old;
      do_play_receive = do_play_receive_old;
      do_online_sound = do_online_sound_old;
      do_no_sound_when_away = do_no_sound_when_away_old;
      do_no_sound_for_ignore = do_no_sound_for_ignore_old;
-     do_away_sound = do_away_sound_old;
         cSetLocalPref("BuddyArriveFilename", BuddyArriveFilename_old);
         cSetLocalPref("BuddyAwayFilename", BuddyAwayFilename_old);
         cSetLocalPref("BuddyLeaveFilename", BuddyLeaveFilename_old);
@@ -1946,7 +1928,7 @@
 static void testsoundfile (GtkWidget * sendf_button, int userdata);
 static void soundvolume_changed(GtkAdjustment * adjust, int userdata);
 
-GtkWidget *add_sound_file_selection_box(gchar *labelString,
+static GtkWidget *add_sound_file_selection_box(gchar *labelString,
                                        GtkWidget *vbox,
                                        gchar *initialFilename,
                                        int userdata) 
@@ -1989,7 +1971,7 @@
      return widget;
 }
 
-GtkWidget *add_sound_volume_selection_box(gchar *labelString,
+static GtkWidget *add_sound_volume_selection_box(gchar *labelString,
                                          GtkWidget *vbox,
                                          GtkAdjustment *adjust)
 {
@@ -2019,7 +2001,7 @@
      return widget;
 }
 
-GtkWidget *soundfileselector;
+static GtkWidget *soundfileselector;
 
 static void getsoundfile (GtkWidget * sendf_button, gpointer userdata)
 {
@@ -2162,7 +2144,7 @@
   fSetLocalPref("SoundVolume", adjust->value);
 }
 
-void write_sound_prefs(FILE *fp)
+static void write_sound_prefs(FILE *fp)
 {
        update_soundfile_entries();
 
@@ -2170,9 +2152,6 @@
      fprintf(fp,"do_play_first=%d\n", do_play_first);
      fprintf(fp,"do_play_receive=%d\n", do_play_receive);
      fprintf(fp,"do_online_sound=%d\n", do_online_sound);
-//     fprintf(fp,"use_typical_sound_method=%d\n", use_typical_sound_method);
-//     fprintf(fp,"use_sounddevice=%d\n", use_sounddevice);
-     fprintf(fp,"do_away_sound=%d\n", do_away_sound);
      fprintf(fp,"do_no_sound_when_away=%d\n", do_no_sound_when_away);
      fprintf(fp,"BuddyArriveFilename=%s\n", 
cGetLocalPref("BuddyArriveFilename"));
      fprintf(fp,"BuddyAwayFilename=%s\n", cGetLocalPref("BuddyAwayFilename"));
@@ -2183,7 +2162,7 @@
      fprintf(fp,"SoundVolume=%f\n", fGetLocalPref("SoundVolume"));
 }
 
-void destroy_sound_prefs(void) {
+static void destroy_sound_prefs(void) {
        gtk_widget_destroy(arrivesoundentry);
        gtk_widget_destroy(awaysoundentry);
        gtk_widget_destroy(leavesoundentry);
@@ -2373,14 +2352,10 @@
        }
        do_logging            =iGetLocalPref("do_logging");
        do_strip_html         =iGetLocalPref("do_strip_html");
-       do_play_send          =iGetLocalPref("do_play_send");
-       do_play_first         =iGetLocalPref("do_play_first");
-       do_play_receive       =iGetLocalPref("do_play_receive");
        do_ignore_unknown     =iGetLocalPref("do_ignore_unknown");
        do_send_idle_time     =iGetLocalPref("do_send_idle_time");
        do_raise_window       =iGetLocalPref("do_raise_window");
        do_timestamp          =iGetLocalPref("do_timestamp");
-       do_online_sound       =iGetLocalPref("do_online_sound");
        do_multi_line         =iGetLocalPref("do_multi_line");
        do_ignore_fore        =iGetLocalPref("do_ignore_fore");
        do_ignore_back        =iGetLocalPref("do_ignore_back");
@@ -2395,13 +2370,15 @@
        use_recoding          =iGetLocalPref("use_recoding");
 #endif
        do_restore_last_conv  =iGetLocalPref("do_restore_last_conv");
-       /*
-       use_typical_sound_method=iGetLocalPref("use_typical_sound_method");
-       use_sounddevice=cGetLocalPref("use_sounddevice");
-       */
-       do_away_sound         =iGetLocalPref("do_away_sound");
-       do_no_sound_when_away =iGetLocalPref("do_no_sound_when_away");
-       do_no_sound_for_ignore=iGetLocalPref("do_no_sound_for_ignore");
+       
+       /* sound  */
+       do_online_sound       = iGetLocalPref("do_online_sound");
+       do_no_sound_when_away = iGetLocalPref("do_no_sound_when_away");
+       do_no_sound_for_ignore= iGetLocalPref("do_no_sound_for_ignore");
+       do_play_send          = iGetLocalPref("do_play_send");
+       do_play_first         = iGetLocalPref("do_play_first");
+       do_play_receive       = iGetLocalPref("do_play_receive");
+
        do_tabbed_chat        =iGetLocalPref("do_tabbed_chat");
        do_tabbed_chat_orient =iGetLocalPref("do_tabbed_chat_orient");
 #ifdef HAVE_ISPELL





reply via email to

[Prev in Thread] Current Thread [Next in Thread]