commitlog Digest, Vol 144, Issue 2

commitlog-request Wed, 04 Apr 2007 01:24:49 -0700

Send commitlog mailing list submissions to
        [email protected]


To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
        [EMAIL PROTECTED]

You can reach the person managing the list at
        [EMAIL PROTECTED]

When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."

Today's Topics:

   1. r1650 -
      trunk/src/target/OM-2007/applications/openmoko-taskmanager/src
      ([EMAIL PROTECTED])
   2. r1651 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])
   3. r1652 - trunk/src/target/u-boot/patches ([EMAIL PROTECTED])

--- Begin Message ---

Author: zhiyong_sun
Date: 2007-04-04 09:26:46 +0200 (Wed, 04 Apr 2007)
New Revision: 1650

Modified:
   trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/callbacks.c
   trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/dbus-conn.c
   trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/list_view.c
   trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/list_view.h
   trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/taskmanager.c
   trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/taskmanager.h
   trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/xatoms.c
   trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/xatoms.h
Log:
openmoko-taskmanager: delete some useless codes, and whitespace change

Modified: 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/callbacks.c  
2007-04-04 03:52:48 UTC (rev 1649)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/callbacks.c  
2007-04-04 07:26:46 UTC (rev 1650)
@@ -23,19 +23,21 @@
 GdkFilterReturn
 moko_window_filter (GdkXEvent *xev, GdkEvent *gev, MokoTaskList*l) 
 {
-    XEvent *ev = (XEvent *)xev;
-    Display *dpy = ev->xany.display;
+  XEvent *ev = (XEvent *)xev;
+  Display *dpy = ev->xany.display;
 
-    if (ev->xany.type == PropertyNotify
-        && ev->xproperty.window == DefaultRootWindow (dpy)) {
-        if (ev->xproperty.atom == atoms[_NET_CLIENT_LIST])     {
-               moko_update_store_list(dpy, l->list_store);
-        }
-        else if (ev->xproperty.atom == atoms[_NET_ACTIVE_WINDOW]) {
-               moko_set_list_highlight (dpy, l);
-        }
+  if (ev->xany.type == PropertyNotify && ev->xproperty.window == 
DefaultRootWindow (dpy)) 
+  {
+    if (ev->xproperty.atom == atoms[_NET_CLIENT_LIST])
+    {
+      moko_update_store_list(dpy, l->list_store);
     }
-    return GDK_FILTER_CONTINUE;
+    else if (ev->xproperty.atom == atoms[_NET_ACTIVE_WINDOW])
+    {
+      moko_set_list_highlight (dpy, l);
+    }
+  }
+  return GDK_FILTER_CONTINUE;
 }
 
 gboolean
@@ -62,67 +64,58 @@
     g_list_free (path);
 }
 
-gboolean 
-moko_cursor_changed(GtkTreeView *treeview, GtkTreeModel *model)
-{
-    g_debug ("Tab event");
-    
-}
-
-
 void
 moko_go_to_btn_cb (GtkButton *btn, MokoTaskManager *tm)
 {
-    if (!tm)
-       return;
-    moko_wm_cmd (tm, GTK_WIDGET (tm->l->list_view), CMD_ACTIVATE_WINDOW);
+  if (!tm)
+    return;
+  moko_wm_cmd (tm, GTK_WIDGET (tm->l->list_view), CMD_ACTIVATE_WINDOW);
 }
 
 void
 moko_kill_btn_cb (GtkButton *btn, MokoTaskManager *tm)
 {
-    if (!tm)
-       return;
-    moko_wm_cmd (tm, GTK_WIDGET (tm->l->list_view), CMD_CLOSE_WINDOW);
+  if (!tm)
+    return;
+  moko_wm_cmd (tm, GTK_WIDGET (tm->l->list_view), CMD_CLOSE_WINDOW);
 }
 
 void
 moko_kill_all_btn_cb (GtkButton *btn, MokoTaskManager *tm)
 {    
-    GtkTreeIter iter;
-    GtkTreeModel *model = gtk_icon_view_get_model (GTK_ICON_VIEW 
(tm->l->list_view));
-    Window *win;
-    GSList *list = NULL;
+  GtkTreeIter iter;
+  GtkTreeModel *model = gtk_icon_view_get_model (GTK_ICON_VIEW 
(tm->l->list_view));
+  Window *win;
+  GSList *list = NULL;
 
-    if (!gtk_tree_model_get_iter_first (model, &iter))
-       return;
+  if (!gtk_tree_model_get_iter_first (model, &iter))
+    return;
     
-    do 
-       {
-       gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, OBJECT_COL, &win, 
-1);
-       list = g_slist_append (list, win);
-       if (!gtk_tree_model_iter_next (model, &iter))
-               break;
-       }
-    while (1);
+  do 
+  {
+    gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, OBJECT_COL, &win, -1);
+    list = g_slist_append (list, win);
+    if (!gtk_tree_model_iter_next (model, &iter))
+    break;
+  }while (1);
 
-   do
-   {
-        mbcommand (GDK_DISPLAY(), CMD_CLOSE_WINDOW, list->data, NULL); 
-       }
-    while (list = g_slist_next (list));
+  do
+  {
+    mbcommand (GDK_DISPLAY(), CMD_CLOSE_WINDOW, list->data, NULL); 
+  }while (list = g_slist_next (list));
   
   if (list)
-       g_slist_free (list);
+    g_slist_free (list);
 }
+
 void
 moko_quit_btn_cb (GtkButton *btn, MokoTaskManager *tm)
 {
-    if (!tm)
-       return;
+  if (!tm)
+    return;
 
-    gtk_window_iconify (GTK_WINDOW (tm->window));
-       moko_dbus_send_message ("");
+  gtk_window_iconify (GTK_WINDOW (tm->window));
+  moko_dbus_send_message (" ");
 }
 
 void

Modified: 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/dbus-conn.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/dbus-conn.c  
2007-04-04 03:52:48 UTC (rev 1649)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/dbus-conn.c  
2007-04-04 07:26:46 UTC (rev 1650)
@@ -26,23 +26,23 @@
 gboolean
 moko_dbus_connect_init (void)
 {
-    /* Get a connection to the system bus */
-    dbus_error_init (&error);
-    bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+  /* Get a connection to the system bus */
+  dbus_error_init (&error);
+  bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
 
-    if (!bus)
-    {
-        g_warning ("Failed to connect to the D-BUS daemon: %s", error.message);
-        return FALSE;
-    }
-  
-    if (dbus_error_is_set (&error))
-    {
-        g_warning ("Connection Error (%s)\n", error.message);
-        dbus_error_free (&error);
-    }
+  if (!bus)
+  {
+    g_warning ("Failed to connect to the D-BUS daemon: %s", error.message);
+    return FALSE;
+  }
+ 
+  if (dbus_error_is_set (&error))
+  {
+    g_warning ("Connection Error (%s)\n", error.message);
+    dbus_error_free (&error);
+  }
 
-    return TRUE;
+  return TRUE;
 }
 
 gboolean

Modified: 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/list_view.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/list_view.c  
2007-04-04 03:52:48 UTC (rev 1649)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/list_view.c  
2007-04-04 07:26:46 UTC (rev 1650)
@@ -170,88 +170,88 @@
 void 
 moko_update_store_list (Display *dpy, GtkListStore *list_store)
 {
-    Window *list;
-    guint nr, i;
-    GtkTreeIter iter;
-    char *p;
+  Window *list;
+  guint nr, i;
+  GtkTreeIter iter;
+  char *p;
 
-    if (moko_update_net_undocked_client_list (dpy, &list, &nr) == FALSE)
-       return;
-    p = g_malloc0 (nr);
+  if (moko_update_net_undocked_client_list (dpy, &list, &nr) == FALSE)
+    return;
+  p = g_malloc0 (nr);
 
-    if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter))
+  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list_store), &iter))
+  {
+    gboolean more;
+    do
     {
-       gboolean more;
-    do{
-       gboolean found = FALSE;
-       Window w;
-       gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, OBJECT_COL, &w, 
-1);
-       for (i=0; i<nr; i++) 
-       {
-           if (list[i] == w) 
-                       {
-               p[i] = 1;
-               found = TRUE;
-               break;
-           }
-       }
-       if (found)
-           more = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), 
&iter);
-       else
-           more = gtk_list_store_remove (list_store, &iter);
-       }
-    while (more);
-    }
-    
-    for (i=0; i<nr; i++) 
-       {
-       if (p[i] == 0 && list[i] != my_win)
-           moko_add_window (dpy, list[i], list_store);
-       }
+      gboolean found = FALSE;
+      Window w;
+      gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, OBJECT_COL, &w, 
-1);
+      for (i=0; i<nr; i++) 
+      {
+        if (list[i] == w) 
+        {
+          p[i] = 1;
+          found = TRUE;
+          break;
+        }
+      }
+      if (found)
+        more = gtk_tree_model_iter_next (GTK_TREE_MODEL (list_store), &iter);
+      else
+        more = gtk_list_store_remove (list_store, &iter);
+    }while (more);
+  }
+  
+  for (i=0; i<nr; i++) 
+  {
+    if (p[i] == 0 && list[i] != my_win)
+      moko_add_window (dpy, list[i], list_store);
+  }
 
-       g_free (p);
+  g_free (p);
 }
 
 void 
 moko_set_list_highlight (Display *dpy, MokoTaskList *l) 
 {
-    Window *wp;
-    Atom type;
-    int format;
-    unsigned long nitems;
-    unsigned long bytes_after;
+  Window *wp;
+  Atom type;
+  int format;
+  unsigned long nitems;
+  unsigned long bytes_after;
   
-    if (XGetWindowProperty (dpy, DefaultRootWindow (dpy), 
atoms[_NET_ACTIVE_WINDOW],
+  if (XGetWindowProperty (dpy, DefaultRootWindow (dpy), 
atoms[_NET_ACTIVE_WINDOW],
                          0, 4, False, XA_WINDOW, &type, &format, &nitems, 
&bytes_after, 
                          (unsigned char **)&wp) == Success)    
+  {
+    if (wp)
     {
-        if (wp)
+      Window w;
+      w = *wp;
+      if (w != 0 && w != my_win) 
+      {
+        GtkTreeIter iter;
+        if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (l->list_store), 
&iter))     
         {
-            Window w;
-            w = *wp;
-            if (w != 0 && w != my_win) 
+          Window iw;
+          do 
+          {
+            gtk_tree_model_get (GTK_TREE_MODEL (l->list_store), &iter, 
OBJECT_COL, &iw, -1);
+            if (iw == w)
             {
-                GtkTreeIter iter;
-                if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL 
(l->list_store), &iter))     
-                {
-                    Window iw;
-                    do 
-                       {
-                        gtk_tree_model_get (GTK_TREE_MODEL (l->list_store), 
&iter, OBJECT_COL, &iw, -1);
-                        if (iw == w)
-                        {
-                            GtkTreePath *path;
-                            path = gtk_tree_model_get_path (GTK_TREE_MODEL 
(l->list_store), &iter);
-                               gtk_icon_view_select_path (GTK_ICON_VIEW 
(l->list_view), path);
-                            gtk_tree_path_free (path);
-                            break;
-                        }
-                      }while (gtk_tree_model_iter_next (GTK_TREE_MODEL 
(l->list_store), &iter));
-                   }
-              }
-          XFree (wp);
-         }
+              GtkTreePath *path;
+              path = gtk_tree_model_get_path (GTK_TREE_MODEL (l->list_store), 
&iter);
+              gtk_icon_view_select_path (GTK_ICON_VIEW (l->list_view), path);
+              gtk_tree_path_free (path);
+              break;
+            }
+          }while (gtk_tree_model_iter_next (GTK_TREE_MODEL (l->list_store), 
&iter));
+        }
+      }
+      XFree (wp);
     }
+  }
 }
 
 static void 

Modified: 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/list_view.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/list_view.h  
2007-04-04 03:52:48 UTC (rev 1649)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/list_view.h  
2007-04-04 07:26:46 UTC (rev 1650)
@@ -34,40 +34,36 @@
 #define MARGIN  10
 
 enum{
-    TEXT_COL = 0,
-    OBJECT_COL,
-    PIXBUF_COL,
-    MAX_COL
+  TEXT_COL = 0,
+  OBJECT_COL,
+  PIXBUF_COL,
+  MAX_COL
 };
+
 G_BEGIN_DECLS
-/*MOKOTASKLIST property*/
 
+#define MOKOTASKLIST_TYPE  (list_get_type())
+#define MOKOTASKLIST(obj)  (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
MOKOTASKLIST_TYPE, MokoTaskList))
+#define MOKOTASKLIST_CLASS(klass)  (G_TYPE_CHECK_CLASS_CAST ((klass), 
MOKOTASKLIST_TYPE, MokoTaskListClass))
+#define IS_MOKOTASKLIST(obj)  (G_TYPE_CHECK_INSTANCE_CAST ((obj), 
MOKOTASKLIST_TYPE))
+#define IS_MOKOTASKLIST_CLASS(klass)  (G_TYPE_CHECK_CLASS_CAST ((klass), 
MOKOTASKLIST_TYPE))
 
-/*Pango Font spec*/
+typedef struct _MokoTaskList  MokoTaskList;
+typedef struct _MokoTaskListClass  MokoTaskListClass;
 
-#define MOKOTASKLIST_TYPE                      (list_get_type())
-#define MOKOTASKLIST(obj)                              
(G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKOTASKLIST_TYPE, MokoTaskList))
-#define MOKOTASKLIST_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), 
MOKOTASKLIST_TYPE, MokoTaskListClass))
-#define IS_MOKOTASKLIST(obj)                   (G_TYPE_CHECK_INSTANCE_CAST 
((obj), MOKOTASKLIST_TYPE))
-#define IS_MOKOTASKLIST_CLASS(klass)   (G_TYPE_CHECK_CLASS_CAST ((klass), 
MOKOTASKLIST_TYPE))
-
-typedef struct _MokoTaskList           MokoTaskList;
-typedef struct _MokoTaskListClass      MokoTaskListClass;
-
 struct _MokoTaskList
 {
-       GtkVBox vbox;
-
-       GtkHBox *hbox;
-       GtkListStore *list_store;
-       GtkWidget *list_view;
-       GtkWidget *scrolled;
+  GtkVBox vbox;
+  GtkHBox *hbox;
+  GtkListStore *list_store;
+  GtkWidget *list_view;
+  GtkWidget *scrolled;
 };
 
 struct _MokoTaskListClass
 {
-       GtkVBoxClass parent_class;
-       void(*list) (MokoTaskList *l);
+  GtkVBoxClass parent_class;
+  void(*list) (MokoTaskList *l);
 };
 
 GType list_get_type (void);

Modified: 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/taskmanager.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/taskmanager.c    
    2007-04-04 03:52:48 UTC (rev 1649)
+++ 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/taskmanager.c    
    2007-04-04 07:26:46 UTC (rev 1650)
@@ -122,60 +122,6 @@
 }
 
 int 
-gtk_widget_set_transparency(GtkWidget *widget, guint opacity) 
-{ 
-   Display *display; 
-   Window window; 
-   Window parent_win; 
-   Window root_win; 
-   Window* child_windows; 
-   int num_child_windows; 
-
-   if(!GTK_IS_WIDGET(widget)){ 
-                printf("gtk_widget_set_transparency: not a widget!\n"); 
-                return -1; 
-   } 
-
-   if(widget->window == NULL){ 
-                printf("gtk_widget_set_transparency: please init widget before 
set transparency!\n"); 
-                return -1; 
-   } 
-
-   /* Set the Display and Screen */ 
-   display = (Display*)gdk_x11_get_default_xdisplay(); 
-   /* sync, so the window manager can know the new widget */ 
-   XSync(display, False); 
-   window = GDK_WINDOW_XWINDOW(widget->window); 
-
-   /* Get the cureent window's top-level window */ 
-   while(1){ 
-        XQueryTree(display, window, 
-                            &root_win, 
-                            &parent_win, 
-                            &child_windows, &num_child_windows); 
-         XFree(child_windows); 
-       /* found the top-level window */ 
-          if(root_win == parent_win) break; 
-          window = parent_win; 
-   } 
-
-   if(opacity == OPAQUE){ 
-           XDeleteProperty(display, window, 
-                                   XInternAtom(display, 
"_NET_WM_WINDOW_OPACITY", False)); 
-   }
-   else{ 
-           XChangeProperty(display, window, 
-                                XInternAtom(display, "_NET_WM_WINDOW_OPACITY", 
False), 
-                                XA_CARDINAL, 32, PropModeReplace, 
-                                (unsigned char *) &opacity, 1L); 
-   } 
-
-   XSync(display, False); 
-
-   return 0; 
-} 
-
-int 
 main (int argc, char** argv)
 {
     Display *dpy;

Modified: 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/taskmanager.h
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/taskmanager.h    
    2007-04-04 03:52:48 UTC (rev 1649)
+++ 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/taskmanager.h    
    2007-04-04 07:26:46 UTC (rev 1650)
@@ -47,19 +47,17 @@
 typedef struct _MokoTaskManager MokoTaskManager;
 
 struct _MokoTaskManager {
-    MokoApplication *app;
+  MokoApplication *app;
     
-    MokoFingerWindow *window;//??
-    GtkWidget *gtk_window;//??
-    MokoFingerWheel *wheel;
-    MokoFingerToolBox *toolbox;
-    MokoTaskList *l;
+  MokoFingerWindow *window;
+  MokoFingerWheel *wheel;
+  MokoFingerToolBox *toolbox;
+  MokoTaskList *l;
     
-    MokoPixmapButton *go_to;
-    MokoPixmapButton *kill;
-    MokoPixmapButton *kill_all;
-    MokoPixmapButton *quit;
-
-    };
+  MokoPixmapButton *go_to;
+  MokoPixmapButton *kill;
+  MokoPixmapButton *kill_all;
+  MokoPixmapButton *quit;
+};
  
 #endif /*taskmanager.h*/

Modified: 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/xatoms.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/xatoms.c     
2007-04-04 03:52:48 UTC (rev 1649)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/xatoms.c     
2007-04-04 07:26:46 UTC (rev 1650)
@@ -22,28 +22,28 @@
  gboolean g_Atom_initialized = FALSE;
 
  char* atom_names[] = {
-       "WM_PROTOCOLS",
-       "_NET_WM_PING",
-       "WM_DELETE_WINDOW",
-       "_NET_CLIENT_LIST",
-       "_NET_CLIENT_LIST_STACKING",
-       "_NET_ACTIVE_WINDOW",
-       "_NET_CLOSE_WINDOW",
-       "_NET_SHOW_DESKTOP",
-       "WM_STATE",
-       "_NET_WM_WINDOW_TYPE",
-       "_NET_WM_WINDOW_TYPE_DESKTOP",
-       "_NET_WM_WINDOW_TYPE_DOCK",
-       "_NET_WM_WINDOW_TYPE_NORMAL",
-       "_NET_WM_WINDOW_TYPE_TOPLEVEL",
-       "_NET_WM_NAME",
-       "_NET_WM_ICON",
-       "_NET_WM_ID",
-       "_NET_STARTUP_ID",
-       "_NET_CLIENT_ID",
-       "_MB_CURRENT_APP_WINDOW",
-       "_MB_COMMAND",
-       "UTF8_STRING",
+  "WM_PROTOCOLS",
+  "_NET_WM_PING",
+  "WM_DELETE_WINDOW",
+  "_NET_CLIENT_LIST",
+  "_NET_CLIENT_LIST_STACKING",
+  "_NET_ACTIVE_WINDOW",
+  "_NET_CLOSE_WINDOW",
+  "_NET_SHOW_DESKTOP",
+  "WM_STATE",
+  "_NET_WM_WINDOW_TYPE",
+  "_NET_WM_WINDOW_TYPE_DESKTOP",
+  "_NET_WM_WINDOW_TYPE_DOCK",
+  "_NET_WM_WINDOW_TYPE_NORMAL",
+  "_NET_WM_WINDOW_TYPE_TOPLEVEL",
+  "_NET_WM_NAME",
+  "_NET_WM_ICON",
+  "_NET_WM_ID",
+  "_NET_STARTUP_ID",
+  "_NET_CLIENT_ID",
+  "_MB_CURRENT_APP_WINDOW",
+  "_MB_COMMAND",
+  "UTF8_STRING",
 };
 
 /**
@@ -52,17 +52,18 @@
 [EMAIL PROTECTED] Bool
 */
 gboolean 
-moko_initialize_X_atoms(const Display* dpy) {
-    if (g_Atom_initialized == TRUE)
-        return TRUE;
-    if (dpy ==NULL)
-        return FALSE;
+moko_initialize_X_atoms(const Display* dpy) 
+{
+  if (g_Atom_initialized == TRUE)
+    return TRUE;
+  if (dpy ==NULL)
+     return FALSE;
     
-    if (XInternAtoms (dpy, atom_names, (sizeof (atom_names) / sizeof 
(atom_names[0])), False, atoms)
-               != Success)
-        return FALSE;
+  if (XInternAtoms (dpy, atom_names, (sizeof (atom_names) / sizeof 
(atom_names[0])), False, atoms)
+       != Success)
+     return FALSE;
     
-    g_Atom_initialized = TRUE;
-    return TRUE;
-    }
+  g_Atom_initialized = TRUE;
+  return TRUE;
+}
 

Modified: 
trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/xatoms.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/xatoms.h     
2007-04-04 03:52:48 UTC (rev 1649)
+++ trunk/src/target/OM-2007/applications/openmoko-taskmanager/src/xatoms.h     
2007-04-04 07:26:46 UTC (rev 1650)
@@ -25,34 +25,33 @@
 #include <gdk/gdk.h>
 
 enum {
-       WM_PROTOCOLS,
-       _NET_WM_PING,
-       WM_DELETE_WINDOW,
-       _NET_CLIENT_LIST,
-       _NET_CLIENT_LIST_STACKING,
-       _NET_ACTIVE_WINDOW,
-    _NET_CLOSE_WINDOW,
-       _NET_SHOW_DESKTOP,
-       WM_STATE,
-       _NET_WM_WINDOW_TYPE,
-       _NET_WM_WINDOW_TYPE_DESKTOP,
-       _NET_WM_WINDOW_TYPE_DOCK,
-       _NET_WM_WINDOW_TYPE_NORMAL,
-       _NET_WM_WINDOW_TYPE_TOPLEVEL,
-       _NET_WM_NAME,
-       _NET_WM_ICON,
-       _NET_WM_ID,
-       WM_CLIENT_LEADER,
-       _NET_CLIENT_ID,
-       _MB_CURRENT_APP_WINDOW,
-       _MB_COMMAND,
-       UTF8_STRING,
-       MAX_ATOM_NO
+  WM_PROTOCOLS,
+  _NET_WM_PING,
+  WM_DELETE_WINDOW,
+  _NET_CLIENT_LIST,
+  _NET_CLIENT_LIST_STACKING,
+  _NET_ACTIVE_WINDOW,
+  _NET_CLOSE_WINDOW,
+  _NET_SHOW_DESKTOP,
+  WM_STATE,
+  _NET_WM_WINDOW_TYPE,
+  _NET_WM_WINDOW_TYPE_DESKTOP,
+  _NET_WM_WINDOW_TYPE_DOCK,
+  _NET_WM_WINDOW_TYPE_NORMAL,
+  _NET_WM_WINDOW_TYPE_TOPLEVEL,
+  _NET_WM_NAME,
+  _NET_WM_ICON,
+  _NET_WM_ID,
+  WM_CLIENT_LEADER,
+  _NET_CLIENT_ID,
+  _MB_CURRENT_APP_WINDOW,
+  _MB_COMMAND,
+  UTF8_STRING,
+  MAX_ATOM_NO
 };
 
 Atom atoms[MAX_ATOM_NO];
 
-gboolean 
-moko_initialize_X_atoms(const Display* dpy);
+gboolean moko_initialize_X_atoms(const Display* dpy);
 
 #endif /*_TASK_MANAGER_X_ATOMS_H*/

--- End Message ---

--- Begin Message ---

Author: werner
Date: 2007-04-04 10:23:29 +0200 (Wed, 04 Apr 2007)
New Revision: 1651

Modified:
   trunk/src/target/u-boot/patches/env_nand_oob.patch
Log:
common/Makefile: updated patch for latest upstream changes



Modified: trunk/src/target/u-boot/patches/env_nand_oob.patch
===================================================================
--- trunk/src/target/u-boot/patches/env_nand_oob.patch  2007-04-04 07:26:46 UTC 
(rev 1650)
+++ trunk/src/target/u-boot/patches/env_nand_oob.patch  2007-04-04 08:23:29 UTC 
(rev 1651)
@@ -17,8 +17,8 @@
 
 Index: u-boot/common/env_nand.c
 ===================================================================
---- u-boot.orig/common/env_nand.c      2007-02-16 23:53:09.000000000 +0100
-+++ u-boot/common/env_nand.c   2007-02-16 23:53:34.000000000 +0100
+--- u-boot.orig/common/env_nand.c
++++ u-boot/common/env_nand.c
 @@ -271,6 +271,33 @@
        ulong total;
        int ret;
@@ -55,8 +55,8 @@
        if (ret || total != CFG_ENV_SIZE)
 Index: u-boot/common/environment.c
 ===================================================================
---- u-boot.orig/common/environment.c   2007-02-16 23:53:09.000000000 +0100
-+++ u-boot/common/environment.c        2007-02-16 23:53:34.000000000 +0100
+--- u-boot.orig/common/environment.c
++++ u-boot/common/environment.c
 @@ -29,6 +29,12 @@
  #undef        __ASSEMBLY__
  #include <environment.h>
@@ -72,8 +72,8 @@
   * crap on symbol names, not TARGETS.
 Index: u-boot/include/environment.h
 ===================================================================
---- u-boot.orig/include/environment.h  2007-02-16 23:53:09.000000000 +0100
-+++ u-boot/include/environment.h       2007-02-16 23:53:34.000000000 +0100
+--- u-boot.orig/include/environment.h
++++ u-boot/include/environment.h
 @@ -70,6 +70,10 @@
  #endif        /* CFG_ENV_IS_IN_FLASH */
  
@@ -95,21 +95,21 @@
  
 Index: u-boot/common/Makefile
 ===================================================================
---- u-boot.orig/common/Makefile        2007-02-16 23:53:15.000000000 +0100
-+++ u-boot/common/Makefile     2007-02-16 23:53:34.000000000 +0100
-@@ -32,7 +32,7 @@
+--- u-boot.orig/common/Makefile
++++ u-boot/common/Makefile
+@@ -31,7 +31,7 @@
          cmd_bdinfo.o cmd_bedbug.o cmd_bmp.o cmd_boot.o cmd_bootm.o \
          cmd_cache.o cmd_console.o \
          cmd_date.o cmd_dcr.o cmd_diag.o cmd_display.o cmd_doc.o cmd_dtt.o \
 -        cmd_eeprom.o cmd_elf.o cmd_ext2.o \
 +        cmd_dynenv.o cmd_eeprom.o cmd_elf.o cmd_ext2.o \
-         cmd_fat.o cmd_fdc.o cmd_fdos.o cmd_flash.o cmd_fpga.o \
+         cmd_fat.o cmd_fdc.o cmd_fdt.o cmd_fdos.o cmd_flash.o cmd_fpga.o \
          cmd_i2c.o cmd_ide.o cmd_immap.o cmd_itest.o cmd_jffs2.o \
          cmd_load.o cmd_log.o \
 Index: u-boot/common/cmd_dynenv.c
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/common/cmd_dynenv.c 2007-02-16 23:53:34.000000000 +0100
+--- /dev/null
++++ u-boot/common/cmd_dynenv.c
 @@ -0,0 +1,85 @@
 +/*
 + * (C) Copyright 2006-2007 OpenMoko, Inc.

--- End Message ---

--- Begin Message ---

Author: werner
Date: 2007-04-04 10:25:39 +0200 (Wed, 04 Apr 2007)
New Revision: 1652

Modified:
   trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
Log:
Makefile: prepend "sh" to execution of board/neo1973/split_by_variant.sh to
  prevent recurrent permission issues



Modified: trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch
===================================================================
--- trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch        
2007-04-04 08:23:29 UTC (rev 1651)
+++ trunk/src/target/u-boot/patches/uboot-20061030-neo1973.patch        
2007-04-04 08:25:39 UTC (rev 1652)
@@ -6,9 +6,9 @@
 
 Index: u-boot/Makefile
 ===================================================================
---- u-boot.orig/Makefile       2007-03-29 21:46:26.000000000 +0200
-+++ u-boot/Makefile    2007-04-02 14:42:27.000000000 +0200
-@@ -1977,6 +1977,14 @@
+--- u-boot.orig/Makefile
++++ u-boot/Makefile
+@@ -1988,6 +1988,14 @@
  sbc2410x_config: unconfig
        @$(MKCONFIG) $(@:_config=) arm arm920t sbc2410x NULL s3c24x0
  
@@ -18,15 +18,15 @@
 +gta01bv3_config \
 +gta01bv4_config \
 +gta01v4_config :      unconfig
-+      @board/neo1973/split_by_variant.sh $@
++      @sh board/neo1973/split_by_variant.sh $@
 +
  qt2410_config :       unconfig
        @./mkconfig $(@:_config=) arm arm920t qt2410 NULL s3c24x0
  
 Index: u-boot/board/neo1973/Makefile
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/Makefile      2007-04-02 14:42:31.000000000 +0200
+--- /dev/null
++++ u-boot/board/neo1973/Makefile
 @@ -0,0 +1,47 @@
 +#
 +# (C) Copyright 2000, 2001, 2002
@@ -77,8 +77,8 @@
 +#########################################################################
 Index: u-boot/board/neo1973/config.mk
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/config.mk     2007-03-29 21:46:26.000000000 +0200
+--- /dev/null
++++ u-boot/board/neo1973/config.mk
 @@ -0,0 +1,34 @@
 +#
 +# (C) Copyright 2002
@@ -116,8 +116,8 @@
 +endif
 Index: u-boot/board/neo1973/neo1973.c
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/neo1973.c     2007-04-02 14:51:14.000000000 +0200
+--- /dev/null
++++ u-boot/board/neo1973/neo1973.c
 @@ -0,0 +1,362 @@
 +/*
 + * (C) 2006 by OpenMoko, Inc.
@@ -483,8 +483,8 @@
 +}
 Index: u-boot/board/neo1973/lowlevel_init.S
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/lowlevel_init.S       2007-03-29 21:46:26.000000000 
+0200
+--- /dev/null
++++ u-boot/board/neo1973/lowlevel_init.S
 @@ -0,0 +1,189 @@
 +/*
 + * Memory Setup stuff - taken from blob memsetup.S
@@ -677,8 +677,8 @@
 +    .word 0x30
 Index: u-boot/board/neo1973/u-boot.lds
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/u-boot.lds    2007-03-29 21:46:26.000000000 +0200
+--- /dev/null
++++ u-boot/board/neo1973/u-boot.lds
 @@ -0,0 +1,58 @@
 +/*
 + * (C) Copyright 2002
@@ -740,8 +740,8 @@
 +}
 Index: u-boot/include/configs/neo1973.h
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/include/configs/neo1973.h   2007-04-02 14:42:34.000000000 +0200
+--- /dev/null
++++ u-boot/include/configs/neo1973.h
 @@ -0,0 +1,265 @@
 +/*
 + * (C) Copyright 2006 OpenMoko, Inc.
@@ -1010,8 +1010,8 @@
 +#endif        /* __CONFIG_H */
 Index: u-boot/board/neo1973/split_by_variant.sh
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/split_by_variant.sh   2007-03-29 21:46:26.000000000 
+0200
+--- /dev/null
++++ u-boot/board/neo1973/split_by_variant.sh
 @@ -0,0 +1,54 @@
 +#!/bin/sh
 +# ---------------------------------------------------------
@@ -1069,8 +1069,8 @@
 +$MKCONFIG -a neo1973 arm arm920t neo1973 NULL s3c24x0
 Index: u-boot/board/neo1973/cmd_neo1973.c
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/cmd_neo1973.c 2007-04-02 14:42:31.000000000 +0200
+--- /dev/null
++++ u-boot/board/neo1973/cmd_neo1973.c
 @@ -0,0 +1,120 @@
 +/*
 + * (C) Copyright 2006 by OpenMoko, Inc.
@@ -1194,8 +1194,8 @@
 +#endif        /* CFG_CMD_BDI */
 Index: u-boot/board/neo1973/neo1973.h
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/neo1973.h     2007-04-02 14:42:29.000000000 +0200
+--- /dev/null
++++ u-boot/board/neo1973/neo1973.h
 @@ -0,0 +1,18 @@
 +#ifndef _NEO1973_H
 +#define _NEO1973_H
@@ -1217,8 +1217,8 @@
 +#endif
 Index: u-boot/board/neo1973/pcf50606.c
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/pcf50606.c    2007-04-01 13:45:34.000000000 +0200
+--- /dev/null
++++ u-boot/board/neo1973/pcf50606.c
 @@ -0,0 +1,100 @@
 +
 +#include <common.h>
@@ -1322,8 +1322,8 @@
 +
 Index: u-boot/common/main.c
 ===================================================================
---- u-boot.orig/common/main.c  2007-03-29 21:46:19.000000000 +0200
-+++ u-boot/common/main.c       2007-04-02 14:42:29.000000000 +0200
+--- u-boot.orig/common/main.c
++++ u-boot/common/main.c
 @@ -61,6 +61,7 @@
  #undef DEBUG_PARSER
  
@@ -1343,8 +1343,8 @@
  # endif
 Index: u-boot/board/neo1973/jbt6k74.c
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/jbt6k74.c     2007-03-29 21:46:26.000000000 +0200
+--- /dev/null
++++ u-boot/board/neo1973/jbt6k74.c
 @@ -0,0 +1,405 @@
 +/* u-boot driver for the tpo JBT6K74-AS LCM ASIC
 + *
@@ -1753,8 +1753,8 @@
 +}
 Index: u-boot/board/neo1973/jbt6k74.h
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/board/neo1973/jbt6k74.h     2007-03-29 21:46:26.000000000 +0200
+--- /dev/null
++++ u-boot/board/neo1973/jbt6k74.h
 @@ -0,0 +1,14 @@
 +#ifndef _JBT6K74_H
 +#define _JBT6K74_H
@@ -1772,8 +1772,8 @@
 +#endif
 Index: u-boot/drivers/Makefile
 ===================================================================
---- u-boot.orig/drivers/Makefile       2007-03-29 21:46:26.000000000 +0200
-+++ u-boot/drivers/Makefile    2007-04-02 14:42:31.000000000 +0200
+--- u-boot.orig/drivers/Makefile
++++ u-boot/drivers/Makefile
 @@ -49,6 +49,7 @@
          usbdcore.o usbdcore_ep0.o usbdcore_omap1510.o usbtty.o \
          videomodes.o w83c553f.o \
@@ -1784,8 +1784,8 @@
          fsl_i2c.o s3c2410_fb.o
 Index: u-boot/drivers/pcf50606.c
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/drivers/pcf50606.c  2007-03-29 21:46:26.000000000 +0200
+--- /dev/null
++++ u-boot/drivers/pcf50606.c
 @@ -0,0 +1,75 @@
 +
 +#include <common.h>
@@ -1864,8 +1864,8 @@
 +#endif /* CONFIG DRIVER_PCF50606 */
 Index: u-boot/include/pcf50606.h
 ===================================================================
---- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ u-boot/include/pcf50606.h  2007-03-29 21:46:26.000000000 +0200
+--- /dev/null
++++ u-boot/include/pcf50606.h
 @@ -0,0 +1,272 @@
 +#ifndef _PCF50606_H
 +#define _PCF50606_H

--- End Message ---

_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog

commitlog Digest, Vol 144, Issue 2

Reply via email to