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

tongsong_li at gta01.hmw-consulting.de tongsong_li at gta01.hmw-consulting.de
Fri Jan 12 03:17:43 CET 2007


Author: tongsong_li
Date: 2007-01-12 03:17:31 +0100 (Fri, 12 Jan 2007)
New Revision: 541

Modified:
   trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.c
   trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.h
   trunk/src/target/OM-2007/applications/openmoko-footer/src/footer.c
   trunk/src/target/OM-2007/applications/openmoko-footer/src/footer.h
   trunk/src/target/OM-2007/applications/openmoko-footer/src/main.c
   trunk/src/target/OM-2007/applications/openmoko-footer/src/main.h
   trunk/src/target/OM-2007/applications/openmoko-footer/src/misc.c
Log:
fixed bug: DBUS_API_SUBJECT_TO_CHANGE Undefine, and some warning

Modified: trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.c	2007-01-12 01:22:27 UTC (rev 540)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.c	2007-01-12 02:17:31 UTC (rev 541)
@@ -16,7 +16,16 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  */
- #include <glib.h>
+#include <glib.h>
+#include <X11/Xlib.h>
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
+#define DBUS_API_SUBJECT_TO_CHANGE
+#endif
+#include <dbus/dbus.h>
+#include <gdk/gdk.h>
+#include <glib/gthread.h>
+#include <pthread.h>
+#include <sys/time.h>
 
 #include "callbacks.h"
 #include "footer.h"
@@ -53,7 +62,6 @@
 footer_rightbutton_clicked(GtkWidget *widget, gpointer my_data) {
     XEvent ev;
     int done = 0;
-    Bool finish = FALSE;
     struct timeval then, now;
     Time click_time=800;
     Display *dpy;
@@ -121,7 +129,7 @@
     g_debug( "interface of message was %s", dbus_message_get_interface(message));
 
     /* Application object is the user data */
-    OMTaskManager* app = user_data;
+    MokoFooter* app = user_data;
 
     /* A signal from the bus saying we are about to be disconnected */
     if (dbus_message_is_signal

Modified: trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.h	2007-01-12 01:22:27 UTC (rev 540)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/src/callbacks.h	2007-01-12 02:17:31 UTC (rev 541)
@@ -16,13 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  */
+
+
 #include <gtk/gtk.h>
-#include <X11/Xlib.h>
-#include <dbus/dbus.h>
-#include <gdk/gdk.h>
-#include <glib/gthread.h>
-#include <pthread.h>
-#include <sys/time.h>
 
 #include "main.h"
 #include "misc.h"

Modified: trunk/src/target/OM-2007/applications/openmoko-footer/src/footer.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/src/footer.c	2007-01-12 01:22:27 UTC (rev 540)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/src/footer.c	2007-01-12 02:17:31 UTC (rev 541)
@@ -90,26 +90,26 @@
     gtk_widget_show (GTK_WIDGET (f->LeftEventBox));
     gtk_event_box_set_visible_window (GTK_EVENT_BOX(f->LeftEventBox),FALSE);
     gtk_box_pack_start (GTK_BOX (f), GTK_WIDGET(f->LeftEventBox), FALSE, FALSE, BUTTON_PADDING);
-    gtk_widget_set_events (GTK_EVENT_BOX (f->LeftEventBox), GDK_BUTTON_PRESS_MASK);
+    gtk_widget_set_events (GTK_WIDGET (f->LeftEventBox), GDK_BUTTON_PRESS_MASK);
        
 
     f->LeftImage = gtk_image_new_from_file (PKGDATADIR"/icon_app_history.png");
     gtk_widget_show (GTK_WIDGET (f->LeftImage));
-    gtk_container_add (f->LeftEventBox, f->LeftImage);
+    gtk_container_add ( GTK_CONTAINER (f->LeftEventBox), f->LeftImage);
 
 /*Label to show dbus message */
     f->CenterLabel = gtk_label_new("OpenMoko Taskmanager");
     gtk_widget_show (GTK_WIDGET (f->CenterLabel));
     gtk_widget_set_name (GTK_WIDGET (f->CenterLabel), "label_footer");
     gtk_misc_set_alignment (GTK_MISC (f->CenterLabel), LABEL_ALIGNMENT_X, LABEL_ALIGNMENT_Y);
-    gtk_label_set_single_line_mode (f->CenterLabel, TRUE);
+    gtk_label_set_single_line_mode (GTK_LABEL (f->CenterLabel), TRUE);
     if (PangoFont){
 	pango_font_description_set_size (PangoFont, FONT_SIZE);
 	gtk_widget_modify_font (GTK_WIDGET (f->CenterLabel), PangoFont);
     }
-    gtk_label_set_ellipsize (f->CenterLabel, PANGO_ELLIPSIZE_END);
+    gtk_label_set_ellipsize (GTK_LABEL (f->CenterLabel), PANGO_ELLIPSIZE_END);
     gtk_box_pack_start (GTK_BOX (f), GTK_WIDGET (f->CenterLabel), TRUE, TRUE, LABEL_PADDING);
-    gtk_label_set_text (f->CenterLabel, "OpenMoko Task Manager");
+    gtk_label_set_text (GTK_LABEL (f->CenterLabel), "OpenMoko Task Manager");
 
 /*right image*/
     f->RightEventBox = gtk_event_box_new (); 
@@ -164,7 +164,7 @@
 void footer_set_status(Footer *f, const char* s)
 {
 //    gtk_statusbar_push( f->statusbar, 1, s );
-    gtk_label_set_text (f->CenterLabel, s);
+    gtk_label_set_text (GTK_LABEL (f->CenterLabel), s);
     /*char message[128];
     char str_fraction[3];
     char* p_fraction;

Modified: trunk/src/target/OM-2007/applications/openmoko-footer/src/footer.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/src/footer.h	2007-01-12 01:22:27 UTC (rev 540)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/src/footer.h	2007-01-12 02:17:31 UTC (rev 541)
@@ -74,11 +74,11 @@
 {
     GtkHBox hbox;
     
-    GtkEventBox* LeftEventBox;
-    GtkImage* LeftImage;
-    GtkLabel* CenterLabel;
-    GtkEventBox* RightEventBox;
-    GtkImage* RightImage; 
+    GtkWidget* LeftEventBox;
+    GtkWidget* LeftImage;
+    GtkWidget* CenterLabel;
+    GtkWidget* RightEventBox;
+    GtkWidget* RightImage; 
 };
 
 struct _FooterClass
@@ -88,12 +88,18 @@
     void (*footer) (Footer *f);
 };
 
-GType          footer_get_type        (void);
-//GtkWidget*     footer_new             (void);
-void           footer_clear           (Footer *f);
+GType
+footer_get_type (void);
 
-void           footer_set_status      (Footer *f, const char* s);
+GtkWidget*     
+footer_new (void);
 
+void
+footer_clear (Footer *f);
+
+void
+footer_set_status (Footer *f, const char* s);
+
 G_END_DECLS
 
 #endif /* OPENMOKO_FOOTER_H */

Modified: trunk/src/target/OM-2007/applications/openmoko-footer/src/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/src/main.c	2007-01-12 01:22:27 UTC (rev 540)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/src/main.c	2007-01-12 02:17:31 UTC (rev 541)
@@ -19,12 +19,17 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
+#define DBUS_API_SUBJECT_TO_CHANGE
+#endif
+#include <dbus/dbus-glib-lowlevel.h>
 
 #include "main.h"
-
-int main( int argc, char **argv )
+#include "callbacks.h"
+int 
+main( int argc, char **argv )
 {
-    OMTaskManager* app;
+    MokoFooter* app;
     DBusError error;
 
     GError* err = NULL;
@@ -35,7 +40,7 @@
     
     dbus_error_init(&error);
 
-    if (!(app = g_malloc ( sizeof (OMTaskManager)))){
+    if (!(app = g_malloc ( sizeof (MokoFooter)))){
     		fprintf (stderr,"Openmoko-taskmanager: footer UI initialized failed, app space malloc failed!");
     		exit (-1);
     	}
@@ -53,10 +58,10 @@
 ///initialize TOP LEVEL WINDOW 
     app->toplevel_win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
     gtk_widget_set_name (app->toplevel_win, "bg_footer");
-    gtk_window_set_title (app->toplevel_win, "OpenMoko Task Manager");
-    gtk_window_set_type_hint (GTK_WINDOW(app->toplevel_win), GDK_WINDOW_TYPE_HINT_DOCK);
-    gtk_window_set_default_size (app->toplevel_win, FOOTER_PROPERTY_WIDTH, FOOTER_PROPERTY_HEIGHT);
-    gtk_widget_set_uposition (app->toplevel_win, FOOTER_PROPERTY_X, FOOTER_PROPERTY_Y);
+    gtk_window_set_title (GTK_WINDOW (app->toplevel_win), "OpenMoko Task Manager");
+    gtk_window_set_type_hint (GTK_WINDOW (app->toplevel_win), GDK_WINDOW_TYPE_HINT_DOCK);
+    gtk_window_set_default_size (GTK_WINDOW (app->toplevel_win), FOOTER_PROPERTY_WIDTH, FOOTER_PROPERTY_HEIGHT);
+    gtk_widget_set_uposition (GTK_WIDGET (app->toplevel_win), FOOTER_PROPERTY_X, FOOTER_PROPERTY_Y);
     gtk_widget_show (app->toplevel_win);
 
 //modify toplevel_win background
@@ -68,7 +73,7 @@
 
 ///initialize OpenMoko Footer Widget
     app->footer = FOOTER(footer_new()); 
-    gtk_widget_show_all (app->footer);
+    gtk_widget_show_all (GTK_WIDGET (app->footer));
     g_signal_connect ( G_OBJECT (app->footer->LeftEventBox), "button_press_event",
     					G_CALLBACK (footer_leftbutton_clicked), app);
     g_signal_connect ( G_OBJECT (app->footer->RightEventBox), "button_press_event",

Modified: trunk/src/target/OM-2007/applications/openmoko-footer/src/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/src/main.h	2007-01-12 01:22:27 UTC (rev 540)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/src/main.h	2007-01-12 02:17:31 UTC (rev 541)
@@ -21,25 +21,28 @@
 #define OM_TASK_MANAGER_H
 
 #include "footer.h"
-#include "callbacks.h"
 
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
+#define DBUS_API_SUBJECT_TO_CHANGE
+#endif
+
 #include <glib/gmain.h>
 #include <gdk/gdk.h>
 #include <dbus/dbus.h>
 #include <gtk/gtkwidget.h>
 
 /**
- * @typedef OMTaskManager
+ * @typedef MokoFooter
  *
  * Opaque structure used for representing an Openmoko Task Manager App. 
  */ 
 /* Types */
-typedef struct _OMTaskManager 
+typedef struct _MokoFooter 
 {
 	DBusConnection* bus;
     	GMainLoop* loop;
     	GtkWidget* toplevel_win;
     	Footer* footer;
-} OMTaskManager;
+} MokoFooter;
 
-#endif /* OMTaskManager.h */
+#endif /* main.h */

Modified: trunk/src/target/OM-2007/applications/openmoko-footer/src/misc.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-footer/src/misc.c	2007-01-12 01:22:27 UTC (rev 540)
+++ trunk/src/target/OM-2007/applications/openmoko-footer/src/misc.c	2007-01-12 02:17:31 UTC (rev 541)
@@ -5,7 +5,7 @@
 
    XEvent	ev;
    Window	root;
-   Atom theme_prop, cmd_prop, desktop_manager_atom;
+   Atom cmd_prop, desktop_manager_atom;
 
    desktop_manager_atom = XInternAtom(dpy, "_NET_DESKTOP_MANGER",False);
 





More information about the commitlog mailing list