[Ayttm-commits] CVS: ayttm/src add_contact_window.c,1.2,1.3 chat_window.c,1.4,1.5 editcontacts.c,1.3,1.4 extgtktext.c,1.2,1.3 log_window.c,1.2,1.3 plugin.h,1.1.1.1,1.2 prefs.c,1.3,1.4 status.c,1.7,1.8

[Colin Leroy <address@hidden>]

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

Modified Files:
        add_contact_window.c chat_window.c editcontacts.c extgtktext.c 
        log_window.c plugin.h prefs.c status.c 
Log Message:
New warning (-Wall) fix by Andy


Index: add_contact_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/add_contact_window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- add_contact_window.c        27 Dec 2002 16:46:52 -0000      1.2
+++ add_contact_window.c        1 Jan 2003 01:54:05 -0000       1.3
@@ -29,6 +29,7 @@
 #include "globals.h"
 #include "util.h"
 #include "dialog.h"
+#include "add_contact_window.h"
 #include "pixmaps/tb_preferences.xpm"
 #include "pixmaps/cancel.xpm"
 

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- chat_window.c       29 Dec 2002 01:22:09 -0000      1.4
+++ chat_window.c       1 Jan 2003 01:54:05 -0000       1.5
@@ -794,26 +794,6 @@
     }
 }
 
-static void disable_send_sounds(GtkWidget * button, gpointer userdata)
-{
-  chat_window * cw = (chat_window *)userdata;
-
-  if (cw->send_enabled)
-    cw->send_enabled = FALSE;
-  else
-    cw->send_enabled = TRUE;
-}
-
-static void disable_receive_sounds(GtkWidget * button, gpointer userdata)
-{
-  chat_window * cw = (chat_window *)userdata;
-
-  if (cw->receive_enabled)
-    cw->receive_enabled = FALSE;
-  else
-    cw->receive_enabled = TRUE;
-}
-
 /*This is the callback for closing the window*/
 
 static void close_win (GtkWidget * close_button, gpointer userdata)
@@ -980,9 +960,14 @@
       /*Sound Selection*/
 
       if (cw->sound_enabled)
-       button = gtk_menu_item_new_with_label(_("Disabled Sounds"));
+      button = gtk_menu_item_new_with_label(_("Disable Sounds"));
       else
-       button = gtk_menu_item_new_with_label(_("Enable Sounds"));
+      button = gtk_menu_item_new_with_label(_("Enable Sounds"));
+
+      gtk_signal_connect(GTK_OBJECT(button), "activate",
+                        GTK_SIGNAL_FUNC(set_sound_on_click), cw);
+      gtk_menu_append(GTK_MENU(menu), button);
+      gtk_widget_show(button);
 
       /*View log selection*/
 
@@ -1182,6 +1167,18 @@
        */
       gint state = event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | 
GDK_MOD1_MASK | GDK_MOD4_MASK);
 
+      if ((state == accel_prev_tab[1]) && (event->keyval == accel_prev_tab[0]))
+       {
+         gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event");
+         gtk_notebook_prev_page( GTK_NOTEBOOK(cw->notebook) );
+         return gtk_true();
+       }
+      else if ((state == accel_next_tab[1]) && (event->keyval == 
accel_next_tab[0]))
+       {
+         gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), "key_press_event");
+         gtk_notebook_next_page( GTK_NOTEBOOK(cw->notebook) );
+         return gtk_true();
+       }
     }
 
   if(cw->perfered==NULL || event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | 
GDK_MOD1_MASK | GDK_MOD4_MASK))
@@ -1568,7 +1565,7 @@
 
   if (cw->sound_enabled)
     {
-      button = gtk_menu_item_new_with_label(_("Disabled Sounds"));
+      button = gtk_menu_item_new_with_label(_("Disable Sounds"));
     }
   else
     {

Index: editcontacts.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/editcontacts.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- editcontacts.c      27 Dec 2002 17:25:32 -0000      1.3
+++ editcontacts.c      1 Jan 2003 01:54:05 -0000       1.4
@@ -46,7 +46,6 @@
 #include "pixmaps/tb_trash.xpm"
 #include "pixmaps/tb_edit.xpm"
 #include "pixmaps/tb_preferences.xpm"
-#include "pixmaps/tb_book_open.xpm"
 
 enum
 {
@@ -144,11 +143,6 @@
                num_accounts--;
                selected_row = -1;
        }
-}
-
-static void options_callback(GtkWidget * widget, gpointer data)
-{
-       build_prefs();
 }
 
 static char * check_login_validity(char * text[])

Index: extgtktext.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/extgtktext.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- extgtktext.c        27 Dec 2002 16:46:52 -0000      1.2
+++ extgtktext.c        1 Jan 2003 01:54:05 -0000       1.3
@@ -4153,8 +4153,10 @@
 find_cursor_at_line (ExtGtkText* text, const LineParams* start_line, gint 
pixel_height)
 {
   GdkWChar ch;
+#ifdef USE_XIM
   GtkEditable *editable = (GtkEditable *)text;
-  
+#endif
+ 
   ExtGtkPropertyMark mark        = start_line->start;
   TabStopMark  tab_mark    = start_line->tab_cont.tab_start;
   gint         pixel_width = LINE_START_PIXEL (*start_line);

Index: log_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/log_window.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- log_window.c        27 Dec 2002 16:46:52 -0000      1.2
+++ log_window.c        1 Jan 2003 01:54:05 -0000       1.3
@@ -24,6 +24,7 @@
  */
 #include "intl.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>

Index: plugin.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/plugin.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- plugin.h    23 Dec 2002 22:05:36 -0000      1.1.1.1
+++ plugin.h    1 Jan 2003 01:54:05 -0000       1.2
@@ -72,6 +72,7 @@
 eb_PLUGIN_INFO *FindPluginByService(char *service);
 
 int unload_module(eb_PLUGIN_INFO *epi);
+void unload_modules();
 int load_module(char *path, char *name);
 void load_modules();
 int load_service_plugin(lt_dlhandle Module, PLUGIN_INFO *info, char *name);

Index: prefs.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/prefs.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- prefs.c     29 Dec 2002 10:22:34 -0000      1.3
+++ prefs.c     1 Jan 2003 01:54:05 -0000       1.4
@@ -617,7 +617,7 @@
      GtkWidget *hbox;
      GSList *group;
      GtkWidget *label;
-     char buff[10];   
+     
      vbox = gtk_vbox_new(FALSE, 5);
 
      /* Values */
@@ -681,7 +681,6 @@
 {
      GtkWidget *vbox;
      GtkWidget *hbox;
-     GSList *group;
      GtkWidget *label;
      char buff[10];   
      vbox = gtk_vbox_new(FALSE, 5);

Index: status.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/status.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- status.c    31 Dec 2002 16:46:27 -0000      1.7
+++ status.c    1 Jan 2003 01:54:05 -0000       1.8
@@ -30,6 +30,7 @@
 #endif
 
 #include "intl.h"
+#include <stdlib.h>
 #include <string.h>
 #include <gtk/gtk.h>
 #include <time.h>
@@ -52,8 +53,6 @@
 #include "trigger.h"
 #include "triggerdecls.h"
 #include "plugin.h"
-#include "pixmaps/tb_preferences.xpm"
-#include "pixmaps/tb_trash.xpm"
 #include "pixmaps/login_icon.xpm"
 #include "pixmaps/blank_icon.xpm"
 #include "pixmaps/logoff_icon.xpm"
@@ -1779,8 +1778,6 @@
        GtkWidget *label;
        GtkWidget *menubox;
        GtkWidget *menu;
-       GtkWidget *submenu;
-       GtkWidget *menuitem;
        GtkWidget *submenuitem;
        GtkWidget *hbox;
        GtkAccelGroup *accel = NULL;