[Ayttm-commits] CVS: ayttm/src chat_room.c,1.35,1.36 chat_window.c,1.27,1.28 dialog.h,1.7,1.8 smileys.c,1.9,1.10 smileys.h,1.3,1.4util.h,1.10,1.11

[Philip S Tellis <address@hidden>]

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

Modified Files:
        chat_room.c chat_window.c dialog.h smileys.c smileys.h util.h 
Log Message:
removed GtkWidget from show_smileys_cb
added comment in util & dialog about fixing header in sound.c


Index: chat_room.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_room.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- chat_room.c 20 Jan 2003 20:33:18 -0000      1.35
+++ chat_room.c 21 Jan 2003 05:31:19 -0000      1.36
@@ -735,6 +735,11 @@
        gtk_widget_destroy(ecr->window);
 }
 
+static void _show_smileys_cb(GtkWidget * widget, smiley_callback_data *data)
+{
+       show_smileys_cb(data);
+}
+
 void eb_join_chat_room( eb_chat_room * chat_room )
 {
        GtkWidget * vbox;
@@ -902,7 +907,7 @@
                                                            _("Insert Smiley"),
                                                            _("Smiley"),
                                                            iconwid,
-                                                           
GTK_SIGNAL_FUNC(show_smileys_cb),
+                                                           
GTK_SIGNAL_FUNC(_show_smileys_cb),
                                                            scd);
                /*Create the separator for the toolbar*/
 

Index: chat_window.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/chat_window.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- chat_window.c       20 Jan 2003 20:33:18 -0000      1.27
+++ chat_window.c       21 Jan 2003 05:31:19 -0000      1.28
@@ -1215,6 +1215,11 @@
   return NULL;
 }
 
+static void _show_smileys_cb(GtkWidget * widget, smiley_callback_data *data)
+{
+       show_smileys_cb(data);
+}
+
 chat_window * eb_chat_window_new(eb_local_account * local, struct contact * 
remote)
 {
   GtkWidget *vbox;
@@ -1604,7 +1609,7 @@
                                                    _("Insert Smiley"),
                                                    _("Smiley"),
                                                    iconwid,
-                                                   
GTK_SIGNAL_FUNC(show_smileys_cb),
+                                                   
GTK_SIGNAL_FUNC(_show_smileys_cb),
                                                    scd);
       /*Create the separator for the toolbar*/
 

Index: dialog.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/dialog.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dialog.h    20 Jan 2003 20:33:18 -0000      1.7
+++ dialog.h    21 Jan 2003 05:31:19 -0000      1.8
@@ -87,6 +87,7 @@
                             GtkWidget *submenu, int nb);
 
 
+/* TODO Check header in sound.c */
 void do_error_dialog(char *message, char *title);
 void eb_icon(GdkWindow *);
 void do_dialog( gchar * message, gchar * title, void (*action)(GtkWidget * 
widget, gpointer data), gpointer data );

Index: smileys.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/smileys.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- smileys.c   16 Jan 2003 13:11:01 -0000      1.9
+++ smileys.c   21 Jan 2003 05:31:19 -0000      1.10
@@ -305,7 +305,7 @@
   return NULL;
 }
 
-void insert_smiley_cb (GtkWidget * widget, smiley_callback_data *data) 
+static void insert_smiley_cb (GtkWidget * widget, smiley_callback_data *data) 
 {
        GtkEditable *entry = NULL;
        int pos;
@@ -337,7 +337,7 @@
                eb_debug(DBG_CORE, "smiley_window is null * !\n");
 }
 
-void show_smileys_cb (GtkWidget *widget, smiley_callback_data *data) {
+void show_smileys_cb (smiley_callback_data *data) {
        eb_local_account *account;
        GList *smileys = NULL;
        protocol_smiley * msmiley = NULL;

Index: smileys.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/smileys.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- smileys.h   10 Jan 2003 23:43:56 -0000      1.3
+++ smileys.h   21 Jan 2003 05:31:19 -0000      1.4
@@ -53,8 +53,7 @@
        chat_window    *c_window;
 };
 
-void insert_smiley_cb (GtkWidget * widget, smiley_callback_data *data); 
-void show_smileys_cb (GtkWidget *widget, smiley_callback_data *data);
+void show_smileys_cb (smiley_callback_data *data);
 
 #ifdef __cplusplus
 } /* extern "C" */

Index: util.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/util.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- util.h      20 Jan 2003 18:09:44 -0000      1.10
+++ util.h      21 Jan 2003 05:31:19 -0000      1.11
@@ -46,6 +46,7 @@
 extern "C" {
 #endif
 
+/* TODO check heder in sound.c */
 int clean_pid(void * dummy);
 char * get_local_addresses();