Changeset 1983

Timestamp:

05/16/07 22:59:31 (6 years ago)

Author:

alphaone

Message:

• src/callbacks.c:

(footer_leftbutton_clicked):
(footer_rightbutton_clicked):

• src/callbacks.h:

Fix the signature of the callback functions

Location:

trunk/src/target/OM-2007/applications/openmoko-footer

Files:

• AUTHORS (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• src/callbacks.c (modified) (6 diffs)
• src/callbacks.h (modified) (1 diff)

trunk/src/target/OM-2007/applications/openmoko-footer/AUTHORS

@@ -1 +1 @@
 Michael 'Mickey' Lauer <mlauer@vanille-media.de>
 Sun Zhiyong <sunzhiyong@fic-sh.com.cn>
+Daniel Willmann <daniel@totalueberwachung.de>

trunk/src/target/OM-2007/applications/openmoko-footer/ChangeLog

@@ +1 @@
+2007-05-16  Daniel Willmann <daniel@totalueberwachung.de>
+
+        * AUTHORS:
+        * ChangeLog:
+
+        * src/callbacks.c:
+        (footer_leftbutton_clicked):
+        (footer_rightbutton_clicked):
+        * src/callbacks.h:
+        Fix the signature of the callback functions

trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.c

@@ -20 +20 @@
 #include <X11/Xlib.h>
 #include <dbus/dbus.h>
+#include <gtk/gtk.h>
 #include <gdk/gdk.h>
 #include <glib/gthread.h>
@@ -32 +33 @@
 *@brief footer leftbutton clicked callback function
 *@param widget  GtkWidget reference
-*@param my_data user data
+*@param user_data       user data
 *@return none
 */
-void 
-footer_leftbutton_clicked(GtkWidget *widget, gpointer my_data)
+gboolean
+footer_leftbutton_clicked(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
     switch (fork())
@@ -48 +49 @@
           break;
      }
+
+     return TRUE;
 }
 
@@ -55 +58 @@
 *@brief footer rightbutton clicked callback function
 *@param widget  GtkWidget reference
-*@param my_data user data
+*@param user_data       user data
 *@return none
 */
-void 
-footer_rightbutton_clicked(GtkWidget *widget, gpointer my_data)
+gboolean
+footer_rightbutton_clicked(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
     XEvent ev;
@@ -101 +104 @@
       g_debug ("tap");
       mbcommand(dpy, MB_CMD_NEXT, NULL);
-      return;
+      return TRUE;
     }
   //function for "tap with hold" action, pop a popupmenu to change time format.
@@ -115 +118 @@
   }
   */
+    return TRUE;
 }
 

trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.h

@@ -32 +32 @@
 
 /* footer */
-void footer_leftbutton_clicked(GtkWidget *widget, gpointer my_data);
+gboolean footer_leftbutton_clicked(GtkWidget *widget, GdkEvent *event, gpointer user_data);
 
-void footer_rightbutton_clicked(GtkWidget *widget, gpointer my_data);
+gboolean footer_rightbutton_clicked(GtkWidget *widget, GdkEvent *event, gpointer user_data);
 
 GdkFilterReturn target_window_event_filter_cb (GdkXEvent *xevent,