r1983 - in trunk/src/target/OM-2007/applications/openmoko-footer: . src
alphaone at sita.openmoko.org
alphaone at sita.openmoko.org
Wed May 16 22:59:31 CEST 2007
Author: alphaone
Date: 2007-05-16 22:59:31 +0200 (Wed, 16 May 2007)
New Revision: 1983
Modified:
trunk/src/target/OM-2007/applications/openmoko-footer/AUTHORS
trunk/src/target/OM-2007/applications/openmoko-footer/ChangeLog
trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.c
trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.h
Log:
* src/callbacks.c:
(footer_leftbutton_clicked):
(footer_rightbutton_clicked):
* src/callbacks.h:
Fix the signature of the callback functions
Modified: trunk/src/target/OM-2007/applications/openmoko-footer/AUTHORS
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/AUTHORS 2007-05-16 20:58:24 UTC (rev 1982)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/AUTHORS 2007-05-16 20:59:31 UTC (rev 1983)
@@ -1,2 +1,3 @@
Michael 'Mickey' Lauer <mlauer at vanille-media.de>
Sun Zhiyong <sunzhiyong at fic-sh.com.cn>
+Daniel Willmann <daniel at totalueberwachung.de>
Modified: trunk/src/target/OM-2007/applications/openmoko-footer/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/ChangeLog 2007-05-16 20:58:24 UTC (rev 1982)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/ChangeLog 2007-05-16 20:59:31 UTC (rev 1983)
@@ -0,0 +1,10 @@
+2007-05-16 Daniel Willmann <daniel at totalueberwachung.de>
+
+ * AUTHORS:
+ * ChangeLog:
+
+ * src/callbacks.c:
+ (footer_leftbutton_clicked):
+ (footer_rightbutton_clicked):
+ * src/callbacks.h:
+ Fix the signature of the callback functions
Modified: trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.c 2007-05-16 20:58:24 UTC (rev 1982)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.c 2007-05-16 20:59:31 UTC (rev 1983)
@@ -19,6 +19,7 @@
#include <glib.h>
#include <X11/Xlib.h>
#include <dbus/dbus.h>
+#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <glib/gthread.h>
#include <pthread.h>
@@ -31,11 +32,11 @@
/**
*@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())
{
@@ -47,6 +48,8 @@
g_debug ("Failed to fork()");
break;
}
+
+ return TRUE;
}
@@ -54,11 +57,11 @@
/**
*@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;
int done = 0;
@@ -100,7 +103,7 @@
{
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.
else if (done == 2)
@@ -114,6 +117,7 @@
mbcommand(dpy, MB_CMD_DESKTOP, NULL);
}
*/
+ return TRUE;
}
GdkFilterReturn
Modified: trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.h 2007-05-16 20:58:24 UTC (rev 1982)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.h 2007-05-16 20:59:31 UTC (rev 1983)
@@ -31,9 +31,9 @@
#define TASK_MANAGER_PROPERTY_Y 45
/* 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,
GdkEvent *event, gpointer user_data);
More information about the commitlog
mailing list