[Ayttm-commits] CVS: ayttm/src status.c,1.13,1.14

[Andy Maloney <address@hidden>]

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

Modified Files:
        status.c 
Log Message:
Use pref functions to access prefs
Change some menus to indicate 'more to come' [i.e. add ...]


Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- status.c    5 Jan 2003 08:32:16 -0000       1.13
+++ status.c    10 Jan 2003 12:38:20 -0000      1.14
@@ -364,28 +364,28 @@
   
   menu = gtk_menu_new();
   
-  eb_menu_button (GTK_MENU(menu), _("Add Account to Contact"),
+  eb_menu_button (GTK_MENU(menu), _("Add Account to Contact..."),
                  GTK_SIGNAL_FUNC(add_account_to_contact_callback), d);
 
-  eb_menu_button (GTK_MENU(menu), _("Edit Contact"),
+  eb_menu_button (GTK_MENU(menu), _("Edit Contact..."),
                  GTK_SIGNAL_FUNC(edit_contact_callback), d);
 
   eb_menu_button (GTK_MENU(menu), _("Delete Contact"),
                  GTK_SIGNAL_FUNC(offer_remove_contact_callback), d);
   
-  eb_menu_button (GTK_MENU(menu), _("Send File"),
+  eb_menu_button (GTK_MENU(menu), _("Send File..."),
                  GTK_SIGNAL_FUNC(send_file_with_contact_callback), d);
   
   submenu = make_info_menu((struct contact *)d);
   eb_menu_submenu (GTK_MENU(menu), _("Info"), submenu);
 
-  eb_menu_button (GTK_MENU(menu), _("Edit Trigger"),
+  eb_menu_button (GTK_MENU(menu), _("Edit Trigger..."),
                  GTK_SIGNAL_FUNC(edit_trigger_callback), d);
 
   /*** MIZHI
    * code for viewing the logs
    */
-  eb_menu_button (GTK_MENU(menu), _("View Log"),
+  eb_menu_button (GTK_MENU(menu), _("View Log..."),
                  GTK_SIGNAL_FUNC(view_log_callback), d);
 
   md = GetPref(EB_CONTACT_MENU);
@@ -417,14 +417,14 @@
 
   menu = gtk_menu_new();
 
-  eb_menu_button (GTK_MENU(menu), _("Edit Account"),
+  eb_menu_button (GTK_MENU(menu), _("Edit Account..."),
                  GTK_SIGNAL_FUNC(edit_account_callback), d);
 
   eb_menu_button (GTK_MENU(menu), _("Delete Account"),
                  GTK_SIGNAL_FUNC(offer_remove_account_callback), d);
 
 
-  eb_menu_button (GTK_MENU(menu), _("Send File"),
+  eb_menu_button (GTK_MENU(menu), _("Send File..."),
                  GTK_SIGNAL_FUNC(send_file_callback), d);
 
   eb_menu_button (GTK_MENU(menu), _("Info"),
@@ -1259,11 +1259,11 @@
        ec->icon_handler = gtk_timeout_add(10000, (GtkFunction)set_contact_icon,
                (gpointer) ec);
 
-       if((time(NULL) - last_sound_played > 0) && do_online_sound)
+       if((time(NULL) - last_sound_played > 0) && 
iGetLocalPref("do_online_sound"))
        {
                /* If we have the do_no_sound_for_ignore flag set,
                   only play the sound if the contact is not ignored. */
-               if (!do_no_sound_for_ignore ||
+               if (!iGetLocalPref("do_no_sound_for_ignore") ||
                (strcasecmp(ec->group->name, _("Ignore")) != 0))
                {
                        play_sound(BUDDY_ARRIVE);
@@ -1292,11 +1292,11 @@
        ec->icon_handler = gtk_timeout_add(10000, (GtkFunction)hide_contact,
                (gpointer) ec);
 
-       if((time(NULL) - last_sound_played > 0) && do_online_sound)
+       if((time(NULL) - last_sound_played > 0) && 
iGetLocalPref("do_online_sound"))
        {
                /* If we have the do_no_sound_for_ignore flag set,
                   only play the sound if the contact is not ignored. */
-               if (!do_no_sound_for_ignore ||
+               if (!iGetLocalPref("do_no_sound_for_ignore") ||
                (strcasecmp(ec->group->name, _("Ignore")) != 0))
                {
                        play_sound(BUDDY_LEAVE);
@@ -1658,10 +1658,10 @@
   { N_("/Tools/Add a _group..."),      NULL, add_group_callback, 0, NULL },
   { N_("/Tools/---"),          NULL,         NULL, 0, "<Separator>" },
   { N_("/Tools/_Preferences..."),      NULL, build_prefs_callback, 0, NULL },
-  { N_("/Tools/_Edit accounts"),               
+  { N_("/Tools/_Edit accounts..."),
                                NULL, eb_edit_accounts, 0, NULL },
   { N_("/_Help"),                      NULL, NULL, 0, "<Branch>" },
-  { N_("/_Help/_About"),               NULL, show_about, 0, NULL }
+  { N_("/_Help/_About Yattm..."),              NULL, show_about, 0, NULL }
 };
 
 static GtkItemFactory *main_menu_factory = NULL;