Changeset 541

Timestamp:

01/12/07 03:17:31 (6 years ago)

Author:

tongsong_li

Message:

fixed bug: DBUS_API_SUBJECT_TO_CHANGE Undefine, and some warning

Location:

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

Files:

• callbacks.c (modified) (3 diffs)
• callbacks.h (modified) (1 diff)
• footer.c (modified) (3 diffs)
• footer.h (modified) (2 diffs)
• main.c (modified) (4 diffs)
• main.h (modified) (3 diffs)
• misc.c (modified) (1 diff)

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

@@ -17 +17 @@
  * 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"
@@ -54 +63 @@
     XEvent ev;
     int done = 0;
-    Bool finish = FALSE;
     struct timeval then, now;
     Time click_time=800;
@@ -122 +130 @@
 
     /* 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 */

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

@@ -17 +17 @@
  * 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"

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

@@ -91 +91 @@
     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 */
@@ -103 +103 @@
     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*/
@@ -165 +165 @@
 {
 //    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];

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

@@ -75 +75 @@
     GtkHBox hbox;
     
-    GtkEventBox* LeftEventBox;
-    GtkImage* LeftImage;
-    GtkLabel* CenterLabel;
-    GtkEventBox* RightEventBox;
-    GtkImage* RightImage; 
+    GtkWidget* LeftEventBox;
+    GtkWidget* LeftImage;
+    GtkWidget* CenterLabel;
+    GtkWidget* RightEventBox;
+    GtkWidget* RightImage; 
 };
 
@@ -89 +89 @@
 };
 
-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

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

@@ -20 +20 @@
 #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;
 
@@ -36 +41 @@
     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);
@@ -54 +59 @@
     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);
 
@@ -69 +74 @@
 ///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);

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

@@ -22 +22 @@
 
 #include "footer.h"
-#include "callbacks.h"
+
+#ifndef DBUS_API_SUBJECT_TO_CHANGE
+#define DBUS_API_SUBJECT_TO_CHANGE
+#endif
 
 #include <glib/gmain.h>
@@ -30 +33 @@
 
 /**
- * @typedef OMTaskManager
+ * @typedef MokoFooter
  *
  * Opaque structure used for representing an Openmoko Task Manager App. 
  */ 
 /* Types */
-typedef struct _OMTaskManager 
+typedef struct _MokoFooter 
 {
         DBusConnection* bus;
@@ -41 +44 @@
         GtkWidget* toplevel_win;
         Footer* footer;
-} OMTaskManager;
+} MokoFooter;
 
-#endif /* OMTaskManager.h */
+#endif /* main.h */

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

@@ -6 +6 @@
    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);