commitlog Digest, Vol 161, Issue 2

Wed, 25 Apr 2007 04:27:17 -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. r1829 - trunk/oe/packages/openmoko-pim ([EMAIL PROTECTED])
   2. r1830 - in trunk/src/target/OM-2007/openmoko-libs: .
      libmokoui ([EMAIL PROTECTED])
   3. r1831 - trunk/oe/packages/openmoko-pim ([EMAIL PROTECTED])
   4. r1832 -
      trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src
      ([EMAIL PROTECTED])
   5. r1833 - in trunk/src/target/OM-2007/openmoko-libs: .
      libmokoui ([EMAIL PROTECTED])
   6. r1834 -
      trunk/src/target/OM-2007/applications/openmoko-dialer/src
      ([EMAIL PROTECTED])
--- Begin Message --- 
Author: laforge
Date: 2007-04-25 12:07:22 +0200 (Wed, 25 Apr 2007)
New Revision: 1829

Modified:
   trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb
Log:
add patch to make openmoko-dates compile with recent mokoui change


Modified: trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb        2007-04-25 
09:15:33 UTC (rev 1828)
+++ trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb        2007-04-25 
10:07:22 UTC (rev 1829)
@@ -4,11 +4,12 @@
 DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs"
 RDEPENDS = "libedata-cal"
 PV = "0.1+svn${SRCDATE}"
-PR = "r8"
+PR = "r9"
 
 inherit gnome autotools pkgconfig gtk-icon-cache
 
 SRC_URI = 
"svn://svn.o-hand.com/repos/dates/branches/;module=openmoko;proto=http \
+          
http://people.openmoko.org/laforge/tmp/openmoko-dates-450-moko_pane_api_change.patch;patch=1
 \
            file://openmoko-dates.png \
            file://openmoko-dates.desktop"

--- End Message ---
--- Begin Message --- 
Author: rob
Date: 2007-04-25 12:11:29 +0200 (Wed, 25 Apr 2007)
New Revision: 1830

Modified:
   trunk/src/target/OM-2007/openmoko-libs/ChangeLog
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h
Log:
2007-04-25  Rob Bradford  <[EMAIL PROTECTED]>

        * libmokoui/moko-scrolled-pane.c: (moko_scrolled_pane_pack),
        (moko_scrolled_pane_unpack), (moko_scrolled_pane_get_child):
        * libmokoui/moko-scrolled-pane.h:
        Improve the API for the MokoScrolledPane widget (see Bugzilla #512.)



Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog    2007-04-25 10:07:22 UTC 
(rev 1829)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog    2007-04-25 10:11:29 UTC 
(rev 1830)
@@ -1,3 +1,10 @@
+2007-04-25  Rob Bradford  <[EMAIL PROTECTED]>
+
+       * libmokoui/moko-scrolled-pane.c: (moko_scrolled_pane_pack),
+       (moko_scrolled_pane_unpack), (moko_scrolled_pane_get_child):
+       * libmokoui/moko-scrolled-pane.h:
+       Improve the API for the MokoScrolledPane widget (see Bugzilla #512.)
+
 2007-04-16  Rob Bradford  <[EMAIL PROTECTED]>
 
        * libmokoui/moko-message-dialog.c: (moko_message_dialog_map),

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c       
2007-04-25 10:07:22 UTC (rev 1829)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c       
2007-04-25 10:11:29 UTC (rev 1830)
@@ -144,9 +144,39 @@
     on = !on;
 }
 
-GtkScrolledWindow* moko_scrolled_pane_get_scrolled_window(MokoScrolledPane* 
self)
+void moko_scrolled_pane_pack (MokoScrolledPane *pane, GtkWidget *child)
 {
-    MokoScrolledPanePrivate* priv = SCROLLED_PANE_GET_PRIVATE(self);
-    g_assert( priv->scrolledwindow );
-    return priv->scrolledwindow;
+  MokoScrolledPanePrivate *priv;
+
+  g_return_if_fail (MOKO_IS_SCROLLED_PANE (pane));
+
+  priv = SCROLLED_PANE_GET_PRIVATE (pane);
+
+  gtk_container_add (GTK_CONTAINER (priv->scrolledwindow), child);
 }
+
+void moko_scrolled_pane_unpack (MokoScrolledPane *pane, GtkWidget *child)
+{
+  MokoScrolledPanePrivate *priv;
+
+  g_return_if_fail (MOKO_IS_SCROLLED_PANE (pane));
+
+  priv = SCROLLED_PANE_GET_PRIVATE (pane);
+
+  gtk_container_remove (GTK_CONTAINER (priv->scrolledwindow), child);
+}
+
+GtkWidget *moko_scrolled_pane_get_child (MokoScrolledPane *pane)
+{
+  MokoScrolledPanePrivate *priv;
+  GtkWidget *child;
+
+  g_return_val_if_fail (MOKO_IS_SCROLLED_PANE (pane), NULL);
+
+  priv = SCROLLED_PANE_GET_PRIVATE (pane);
+
+  child = gtk_bin_get_child (GTK_BIN(priv->scrolledwindow));
+
+  return child;
+}
+

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h       
2007-04-25 10:07:22 UTC (rev 1829)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h       
2007-04-25 10:11:29 UTC (rev 1830)
@@ -43,6 +43,10 @@
 GType moko_scrolled_pane_get_type();
 GtkWidget* moko_scrolled_pane_new();
 
+void moko_scrolled_pane_pack (MokoScrolledPane *pane, GtkWidget *child);
+void moko_scrolled_pane_unpack (MokoScrolledPane *pane, GtkWidget *child);
+GtkWidget *moko_scrolled_pane_get_child (MokoScrolledPane *pane);
+
 G_END_DECLS
 
 #endif // _MOKO_SCROLLED_PANE_H_

--- End Message ---
--- Begin Message --- 
Author: laforge
Date: 2007-04-25 12:22:05 +0200 (Wed, 25 Apr 2007)
New Revision: 1831

Modified:
   trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb
Log:
api change (paned window) has been merged mainline


Modified: trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb        2007-04-25 
10:11:29 UTC (rev 1830)
+++ trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb        2007-04-25 
10:22:05 UTC (rev 1831)
@@ -9,7 +9,6 @@
 inherit gnome autotools pkgconfig gtk-icon-cache
 
 SRC_URI = 
"svn://svn.o-hand.com/repos/dates/branches/;module=openmoko;proto=http \
-          
http://people.openmoko.org/laforge/tmp/openmoko-dates-450-moko_pane_api_change.patch;patch=1
 \
            file://openmoko-dates.png \
            file://openmoko-dates.desktop"

--- End Message ---
--- Begin Message --- 
Author: rob
Date: 2007-04-25 13:01:32 +0200 (Wed, 25 Apr 2007)
New Revision: 1832

Modified:
   trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c
Log:
Fix build problems with new API.


Modified: trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c
===================================================================
--- trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c      
2007-04-25 10:22:05 UTC (rev 1831)
+++ trunk/src/target/OM-2007/examples/openmoko-stylus-demo/src/demo-main.c      
2007-04-25 11:01:32 UTC (rev 1832)
@@ -303,9 +303,8 @@
 
     /*moko_paned_window_set_navigation_pane( window, 
GTK_WIDGET(moko_tree_view_put_into_scrolled_window(moko_treeview)) );*/
 
-    MokoScrolledPane* navigationwindow = moko_scrolled_pane_new();
-    GtkScrolledWindow* scrolledwindow1 = 
moko_scrolled_pane_get_scrolled_window( navigationwindow );
-    gtk_container_add( scrolledwindow1, GTK_WIDGET(moko_treeview) );
+    MokoScrolledPane *navigationwindow = moko_scrolled_pane_new();
+    moko_scrolled_pane_pack (MOKO_SCROLLED_PANE (navigationwindow), 
GTK_WIDGET(moko_treeview));
     moko_paned_window_set_navigation_pane( window, 
GTK_WIDGET(navigationwindow) );
 
     GtkButton* button1;
@@ -362,8 +361,7 @@
             "\nto make the fullscreen\n \ntrigger more interesting\n \n \n" );
 
     MokoScrolledPane* detailswindow = moko_scrolled_pane_new();
-    GtkScrolledWindow* scrolledwindow2 = 
moko_scrolled_pane_get_scrolled_window( detailswindow );
-    gtk_scrolled_window_add_with_viewport( scrolledwindow2, 
GTK_WIDGET(details) );
+    moko_scrolled_pane_pack_with_viewport (MOKO_SCROLLED_PANE (detailswindow), 
GTK_WIDGET (details));
     moko_paned_window_set_details_pane( window, GTK_WIDGET(detailswindow) );
 
     moko_paned_window_set_ratio( window, 50 );

--- End Message ---
--- Begin Message --- 
Author: rob
Date: 2007-04-25 13:04:05 +0200 (Wed, 25 Apr 2007)
New Revision: 1833

Modified:
   trunk/src/target/OM-2007/openmoko-libs/ChangeLog
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c
   trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h
Log:
2007-04-25  Rob Bradford  <[EMAIL PROTECTED]>

        * libmokoui/moko-scrolled-pane.c:
        (moko_scrolled_pane_pack_with_viewport):
        * libmokoui/moko-scrolled-pane.h:
        Add a moko_scrolled_pane_pack_with_viewport function.



Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog    2007-04-25 11:01:32 UTC 
(rev 1832)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog    2007-04-25 11:04:05 UTC 
(rev 1833)
@@ -1,5 +1,12 @@
 2007-04-25  Rob Bradford  <[EMAIL PROTECTED]>
 
+       * libmokoui/moko-scrolled-pane.c:
+       (moko_scrolled_pane_pack_with_viewport):
+       * libmokoui/moko-scrolled-pane.h:
+       Add a moko_scrolled_pane_pack_with_viewport function.
+
+2007-04-25  Rob Bradford  <[EMAIL PROTECTED]>
+
        * libmokoui/moko-scrolled-pane.c: (moko_scrolled_pane_pack),
        (moko_scrolled_pane_unpack), (moko_scrolled_pane_get_child):
        * libmokoui/moko-scrolled-pane.h:

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c       
2007-04-25 11:01:32 UTC (rev 1832)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.c       
2007-04-25 11:04:05 UTC (rev 1833)
@@ -155,6 +155,17 @@
   gtk_container_add (GTK_CONTAINER (priv->scrolledwindow), child);
 }
 
+void moko_scrolled_pane_pack_with_viewport (MokoScrolledPane *pane, GtkWidget 
*child)
+{
+  MokoScrolledPanePrivate *priv;
+
+  g_return_if_fail (MOKO_IS_SCROLLED_PANE (pane));
+
+  priv = SCROLLED_PANE_GET_PRIVATE (pane);
+
+  gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW 
(priv->scrolledwindow), child);
+}
+
 void moko_scrolled_pane_unpack (MokoScrolledPane *pane, GtkWidget *child)
 {
   MokoScrolledPanePrivate *priv;

Modified: trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h       
2007-04-25 11:01:32 UTC (rev 1832)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokoui/moko-scrolled-pane.h       
2007-04-25 11:04:05 UTC (rev 1833)
@@ -46,6 +46,7 @@
 void moko_scrolled_pane_pack (MokoScrolledPane *pane, GtkWidget *child);
 void moko_scrolled_pane_unpack (MokoScrolledPane *pane, GtkWidget *child);
 GtkWidget *moko_scrolled_pane_get_child (MokoScrolledPane *pane);
+void moko_scrolled_pane_pack_with_viewport (MokoScrolledPane *pane, GtkWidget 
*child);
 
 G_END_DECLS

--- End Message ---
--- Begin Message --- 
Author: thomas
Date: 2007-04-25 13:28:46 +0200 (Wed, 25 Apr 2007)
New Revision: 1834

Modified:
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.h
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.h
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.h
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.h
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.h
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
   
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.h
Log:
* Use glib style name for application data struct typedef
  ("s/MOKO_DIALER_APP_DATA/MokoDialerData/g")


Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
    2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
    2007-04-25 11:28:46 UTC (rev 1834)
@@ -45,8 +45,8 @@
 #include "openmoko-dialer-window-pin.h"
 #include "openmoko-dialer-window-history.h"
 
-MOKO_DIALER_APP_DATA *p_dialer_data = 0;
-MOKO_DIALER_APP_DATA *
+MokoDialerData *p_dialer_data = 0;
+MokoDialerData *
 moko_get_app_data ()
 {
   return p_dialer_data;
@@ -55,7 +55,7 @@
 void
 gsm_pin_require (struct lgsm_handle *lh)
 {
-  MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+  MokoDialerData *appdata = moko_get_app_data ();
 
   if (appdata)
   {
@@ -73,7 +73,7 @@
 gsm_incoming_call (gchar * number)
 {
 
-  MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+  MokoDialerData *appdata = moko_get_app_data ();
 
   if (appdata)
   {
@@ -122,7 +122,7 @@
 void
 gsm_peer_accept ()
 {
-  MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+  MokoDialerData *appdata = moko_get_app_data ();
   DBG_ENTER ();
 //moko_dialer_status_update_icon(appdata->status_outgoing);
 
@@ -146,7 +146,7 @@
 void
 gsm_peer_refuse ()
 {
-  MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+  MokoDialerData *appdata = moko_get_app_data ();
   window_outgoing_fails (appdata);
 }
 
@@ -154,7 +154,7 @@
 gsm_peer_abort ()
 {
 
-  MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+  MokoDialerData *appdata = moko_get_app_data ();
   if (appdata->window_incoming)
     gtk_widget_hide (appdata->window_incoming);
 
@@ -165,7 +165,7 @@
 gsm_peer_disconnect ()
 {
 
-  MOKO_DIALER_APP_DATA *appdata = moko_get_app_data ();
+  MokoDialerData *appdata = moko_get_app_data ();
   /* TODO: MokoGsmdConnection->hangup 
    * gsm_hangup ();
    */
@@ -185,7 +185,7 @@
 handle_sigusr1 (int value)
 {
   DBG_ENTER ();
-  MOKO_DIALER_APP_DATA *p_data = moko_get_app_data ();
+  MokoDialerData *p_data = moko_get_app_data ();
   if (!p_data)
     return;
   GtkWidget *mainwindow = p_data->window_present;
@@ -305,7 +305,7 @@
   setlock ("/tmp/dialer.lock");
 
 
-  p_dialer_data = calloc (1, sizeof (MOKO_DIALER_APP_DATA));
+  p_dialer_data = calloc (1, sizeof (MokoDialerData));
 
   //init application data
   contact_init_contact_data (&(p_dialer_data->g_contactlist));

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
    2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.h
    2007-04-25 11:28:46 UTC (rev 1834)
@@ -99,4 +99,4 @@
   HISTORY_TYPE g_history_filter_type;   ///<indicates the current history 
filter type, the gtktreeview will be filtered on the value.
 
   GdkPixbuf *g_iconReceived, *g_iconMissed, *g_iconDialed;      ///<the global 
pixbuf for the 3 icons displayed in the history window.}DIALER_APP_DATA;
-} MOKO_DIALER_APP_DATA;
+} MokoDialerData;

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
   2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.c
   2007-04-25 11:28:46 UTC (rev 1834)
@@ -38,7 +38,7 @@
 #include "openmoko-dialer-window-outgoing.h"
 
 void
-cb_delete_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
+cb_delete_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   g_debug ("delete button clicked");
 
@@ -85,7 +85,7 @@
 }
 
 void
-cb_history_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
+cb_history_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   if (!appdata->window_history)
     window_history_init (appdata);
@@ -96,7 +96,7 @@
 }
 
 void
-window_dialer_dial_out (MOKO_DIALER_APP_DATA * appdata)
+window_dialer_dial_out (MokoDialerData * appdata)
 {
   gchar *codesinput;
   //get the input digits
@@ -157,7 +157,7 @@
 }
 
 void
-cb_dialer_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
+cb_dialer_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   window_dialer_dial_out (appdata);
 }
@@ -171,7 +171,7 @@
   gchar *codesinput;
   gint lenstring = 0;
   gint leninput = 0;
-  MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *appdata = (MokoDialerData *) user_data;
   MokoDialerTextview *moko_dialer_text_view = appdata->moko_dialer_text_view;
   DIALER_READY_CONTACT *ready_contact = (DIALER_READY_CONTACT *) para_pointer;
   codesinput = moko_dialer_textview_get_input (moko_dialer_text_view, FALSE);
@@ -203,7 +203,7 @@
                                    gpointer user_data)
 {
 
-  MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *appdata = (MokoDialerData *) user_data;
   MokoDialerTextview *moko_dialer_text_view = appdata->moko_dialer_text_view;
   DIALER_READY_CONTACT *ready_contact = (DIALER_READY_CONTACT *) para_pointer;
   DBG_MESSAGE ("GOT THE MESSAGE OF confirmed:%s",
@@ -220,7 +220,7 @@
 on_dialer_autolist_nomatch (GtkWidget * widget, gpointer user_data)
 {
 
-  MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *appdata = (MokoDialerData *) user_data;
   MokoDialerTextview *moko_dialer_text_view = appdata->moko_dialer_text_view;
 
   DBG_MESSAGE ("GOT THE MESSAGE OF no match");
@@ -231,12 +231,12 @@
 void
 on_dialer_menu_close (GtkWidget * widget, gpointer user_data)
 {
-  MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *appdata = (MokoDialerData *) user_data;
   gtk_main_quit ();
 }
 
 void
-on_dialer_menu_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
+on_dialer_menu_hide (GtkWidget * widget, MokoDialerData * appdata)
 {
   gtk_widget_hide (appdata->window_dialer);
 }
@@ -254,7 +254,7 @@
   gchar *codesinput = NULL;
 
 //DBG_TRACE();
-  MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *appdata = (MokoDialerData *) user_data;
   MokoDialerTextview *moko_dialer_text_view = appdata->moko_dialer_text_view;
 
 
@@ -289,13 +289,13 @@
 }
 
 void
-on_window_dialer_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
+on_window_dialer_hide (GtkWidget * widget, MokoDialerData * appdata)
 {
   appdata->window_present = 0;
 }
 
 void
-on_window_dialer_show (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
+on_window_dialer_show (GtkWidget * widget, MokoDialerData * appdata)
 {
   DBG_ENTER ();
   appdata->window_present = widget;
@@ -310,7 +310,7 @@
 #define WINDOW_DIALER_BUTTON_SIZE_X 100
 #define WINDOW_DIALER_BUTTON_SIZE_Y 100
 gint
-window_dialer_init (MOKO_DIALER_APP_DATA * p_dialer_data)
+window_dialer_init (MokoDialerData * p_dialer_data)
 {
 
   if (!p_dialer_data->window_dialer)

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.h
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.h
   2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-dialer.h
   2007-04-25 11:28:46 UTC (rev 1834)
@@ -29,7 +29,7 @@
 #endif
 
 
-  gint window_dialer_init (MOKO_DIALER_APP_DATA * p_dialer_data);
+  gint window_dialer_init (MokoDialerData * p_dialer_data);
 
 #ifdef __cplusplus
 }

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
  2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.c
  2007-04-25 11:28:46 UTC (rev 1834)
@@ -45,7 +45,7 @@
 
 /* function declarations */
 
-gint history_update_counter (MOKO_DIALER_APP_DATA * p_dialer_data);
+gint history_update_counter (MokoDialerData * p_dialer_data);
 
 
 /**
@@ -59,7 +59,7 @@
  */
 
 int
-history_view_change_filter (MOKO_DIALER_APP_DATA * p_dialer_data,
+history_view_change_filter (MokoDialerData * p_dialer_data,
                             HISTORY_TYPE type)
 {
   GtkTreePath *path;
@@ -80,7 +80,7 @@
 void
 on_all_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
 {
-  MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *p_dialer_data = (MokoDialerData *) user_data;
   GtkWidget *label = p_dialer_data->label_filter_history;
   gtk_label_set_text (GTK_LABEL (label), "All");
   history_view_change_filter (p_dialer_data, ALL);
@@ -91,7 +91,7 @@
 void
 on_missed_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
 {
-  MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *p_dialer_data = (MokoDialerData *) user_data;
   GtkWidget *label = p_dialer_data->label_filter_history;
   gtk_label_set_text (GTK_LABEL (label), "Missed");
   history_view_change_filter (p_dialer_data, MISSED);
@@ -102,7 +102,7 @@
 void
 on_dialed_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
 {
-  MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *p_dialer_data = (MokoDialerData *) user_data;
   GtkWidget *label = p_dialer_data->label_filter_history;
   gtk_label_set_text (GTK_LABEL (label), "Dialed");
   history_view_change_filter (p_dialer_data, OUTGOING);
@@ -113,7 +113,7 @@
 void
 on_received_calls_activate (GtkMenuItem * menuitem, gpointer user_data)
 {
-  MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *p_dialer_data = (MokoDialerData *) user_data;
   GtkWidget *label = p_dialer_data->label_filter_history;
   gtk_label_set_text (GTK_LABEL (label), "Received");
   history_view_change_filter (p_dialer_data, INCOMING);
@@ -123,7 +123,7 @@
 gboolean
 on_eventboxTop_button_release_event (GtkWidget * widget,
                                      GdkEventButton * event,
-                                     MOKO_DIALER_APP_DATA * appdata)
+                                     MokoDialerData * appdata)
 {
 
   gtk_menu_popup (GTK_MENU (appdata->menu_history), 0, 0, 0, 0, 0, 0);
@@ -133,7 +133,7 @@
 
 void
 cb_openmoko_history_wheel_press_left_up (GtkWidget * widget,
-                                         MOKO_DIALER_APP_DATA * appdata)
+                                         MokoDialerData * appdata)
 {
   DBG_ENTER ();
   GtkTreeSelection *selection;
@@ -169,7 +169,7 @@
 
 void
 cb_openmoko_history_wheel_press_right_down (GtkWidget * widget,
-                                            MOKO_DIALER_APP_DATA * appdata)
+                                            MokoDialerData * appdata)
 {
   DBG_ENTER ();
   GtkTreeSelection *selection;
@@ -203,7 +203,7 @@
 
 void
 cb_tool_button_history_delete_clicked (GtkButton * button,
-                                       MOKO_DIALER_APP_DATA * appdata)
+                                       MokoDialerData * appdata)
 {
   GtkTreeIter iter;             //iter of the filter store
   GtkTreeIter iter0;            //iter of the back store
@@ -268,7 +268,7 @@
 
 void
 cb_tool_button_history_call_clicked (GtkButton * button,
-                                     MOKO_DIALER_APP_DATA * appdata)
+                                     MokoDialerData * appdata)
 {
   DBG_ENTER ();
 
@@ -278,7 +278,7 @@
 
 void
 cb_tool_button_history_sms_clicked (GtkButton * button,
-                                    MOKO_DIALER_APP_DATA * appdata)
+                                    MokoDialerData * appdata)
 {
   DBG_ENTER ();
 
@@ -288,7 +288,7 @@
 
 void
 cb_tool_button_history_back_clicked (GtkButton * button,
-                                     MOKO_DIALER_APP_DATA * appdata)
+                                     MokoDialerData * appdata)
 {
   gtk_widget_hide (appdata->window_history);
 
@@ -296,7 +296,7 @@
 
 
 void
-on_window_history_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
+on_window_history_hide (GtkWidget * widget, MokoDialerData * appdata)
 {
 
   gtk_widget_hide (appdata->wheel_history);
@@ -305,7 +305,7 @@
 }
 
 void
-on_window_history_show (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
+on_window_history_show (GtkWidget * widget, MokoDialerData * appdata)
 {
   DBG_ENTER ();
 
@@ -331,7 +331,7 @@
 
 
 gint
-window_history_init (MOKO_DIALER_APP_DATA * p_dialer_data)
+window_history_init (MokoDialerData * p_dialer_data)
 {
 
   DBG_ENTER ();
@@ -443,7 +443,7 @@
   GtkTreeSelection *selection;
   HISTORY_ENTRY *p;
   int hasname;
-  MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *p_dialer_data = (MokoDialerData *) user_data;
 
   selection =
     gtk_tree_view_get_selection (GTK_TREE_VIEW
@@ -467,7 +467,7 @@
 
 
 GtkWidget *
-create_window_history_content (MOKO_DIALER_APP_DATA * p_dialer_data)
+create_window_history_content (MokoDialerData * p_dialer_data)
 {
 
   GtkWidget *treeviewHistory;
@@ -571,7 +571,7 @@
 history_view_filter_visible_function (GtkTreeModel * model,
                                       GtkTreeIter * iter, gpointer data)
 {
-  MOKO_DIALER_APP_DATA *p_dialer_data = (MOKO_DIALER_APP_DATA *) data;
+  MokoDialerData *p_dialer_data = (MokoDialerData *) data;
   HISTORY_TYPE type;
   if (p_dialer_data->g_history_filter_type == ALL)
     return TRUE;
@@ -597,7 +597,7 @@
  */
 
 gint
-history_build_history_list_view (MOKO_DIALER_APP_DATA * p_dialer_data)
+history_build_history_list_view (MokoDialerData * p_dialer_data)
 {
   GtkListStore *list_store;
 
@@ -781,7 +781,7 @@
  * @return 1
  */
 gint
-history_update_counter (MOKO_DIALER_APP_DATA * p_dialer_data)
+history_update_counter (MokoDialerData * p_dialer_data)
 {
   DBG_ENTER ();
   GtkTreeIter iter;
@@ -830,7 +830,7 @@
 }
 
 GtkWidget *
-history_create_menu_history (MOKO_DIALER_APP_DATA * p_dialer_data)
+history_create_menu_history (MokoDialerData * p_dialer_data)
 {
   if (!p_dialer_data->menu_history)
   {
@@ -942,7 +942,7 @@
  * @retval 1 everything is OK
  */
 gint
-history_list_view_add (MOKO_DIALER_APP_DATA * appdata, HISTORY_ENTRY * entry)
+history_list_view_add (MokoDialerData * appdata, HISTORY_ENTRY * entry)
 {
   DBG_ENTER ();
   if (entry == 0)
@@ -1028,7 +1028,7 @@
 
 
 gint
-add_histroy_entry (MOKO_DIALER_APP_DATA * appdata, HISTORY_TYPE type,
+add_histroy_entry (MokoDialerData * appdata, HISTORY_TYPE type,
                    const char *name, const char *number, const char *id,
                    char *time, char *date, int durationsec)
 {

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.h
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.h
  2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-history.h
  2007-04-25 11:28:46 UTC (rev 1834)
@@ -29,18 +29,18 @@
 #endif
 
 
-  GtkWidget *create_window_history_content (MOKO_DIALER_APP_DATA *
+  GtkWidget *create_window_history_content (MokoDialerData *
                                             p_dialer_data);
-  gint window_history_init (MOKO_DIALER_APP_DATA * p_dialer_data);
-  gint history_build_history_list_view (MOKO_DIALER_APP_DATA * p_dialer_data);
-  void window_history_prepare (MOKO_DIALER_APP_DATA * appdata);
-  GtkWidget *history_create_menu_history (MOKO_DIALER_APP_DATA *
+  gint window_history_init (MokoDialerData * p_dialer_data);
+  gint history_build_history_list_view (MokoDialerData * p_dialer_data);
+  void window_history_prepare (MokoDialerData * appdata);
+  GtkWidget *history_create_menu_history (MokoDialerData *
                                           p_dialer_data);
-  gint add_histroy_entry (MOKO_DIALER_APP_DATA * appdata, HISTORY_TYPE type,
+  gint add_histroy_entry (MokoDialerData * appdata, HISTORY_TYPE type,
                           const char *name, const char *number,
                           const char *picpath, char *time, char *date,
                           int durationsec);
-  gint history_list_view_add (MOKO_DIALER_APP_DATA * appdata,
+  gint history_list_view_add (MokoDialerData * appdata,
                               HISTORY_ENTRY * entry);
 #ifdef __cplusplus
 }

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
 2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
 2007-04-25 11:28:46 UTC (rev 1834)
@@ -39,7 +39,7 @@
 #include "history.h"
 
void 
 cb_answer_button_clicked (GtkButton * button,
-                          MOKO_DIALER_APP_DATA * appdata) 
+                          MokoDialerData * appdata) 
 {
   DBG_ENTER ();
   appdata->g_state.callstate = STATE_TALKING;
@@ -57,7 +57,7 @@
 
 void
 cb_ignore_button_clicked (GtkButton * button,
-                          MOKO_DIALER_APP_DATA * appdata) 
+                          MokoDialerData * appdata) 
 {
   
DBG_ENTER ();
   
DBG_MESSAGE ("We will mute the phone for this call.");
@@ -66,7 +66,7 @@
 
} 

void 
 
 cb_reject_button_clicked (GtkButton * button,
-                          MOKO_DIALER_APP_DATA * appdata) 
+                          MokoDialerData * appdata) 
 {
   DBG_ENTER ();
   /* TODO: MokoGsmdConnection->hangup
@@ -78,7 +78,7 @@
 }
 
 void
-window_incoming_prepare (MOKO_DIALER_APP_DATA * appdata) 
+window_incoming_prepare (MokoDialerData * appdata) 
 {
   
if (!appdata)
     
@@ -110,11 +110,11 @@
   

}
 



}
 

void 
-window_incoming_fails (MOKO_DIALER_APP_DATA * appdata) 
+window_incoming_fails (MokoDialerData * appdata) 
 {
   
DBG_ENTER ();
   
DBG_LEAVE ();
-
} 

gint 
 timer_incoming_time_out (MOKO_DIALER_APP_DATA * appdata) 
+
} 

gint 
 timer_incoming_time_out (MokoDialerData * appdata) 
 {
   
 //DBG_ENTER();
@@ -151,7 +151,7 @@
     return 1;
 


}
 



void 
-on_window_incoming_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata) 
+on_window_incoming_hide (GtkWidget * widget, MokoDialerData * appdata) 
 {
   

DBG_ENTER ();
   

if (appdata->g_timer_data.ptimer != 0)
@@ -176,7 +176,7 @@
   

DBG_LEAVE ();
 
}
 

void 
-window_incoming_setup_timer (MOKO_DIALER_APP_DATA * appdata) 
+window_incoming_setup_timer (MokoDialerData * appdata) 
 {
   
time_t timep;
   
struct tm *p;
@@ -199,13 +199,13 @@
                     (gpointer) appdata);
 


}
 

void 
-on_window_incoming_show (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata) 
+on_window_incoming_show (GtkWidget * widget, MokoDialerData * appdata) 
 {
   

DBG_ENTER ();
   
appdata->g_state.callstate = STATE_INCOMING;
   
window_incoming_setup_timer (appdata);
   
DBG_LEAVE ();
-

} 


gint 
 window_incoming_init (MOKO_DIALER_APP_DATA * p_dialer_data) 
+

} 


gint 
 window_incoming_init (MokoDialerData * p_dialer_data) 
 {
   

DBG_ENTER ();
   
MokoFingerWindow * window;

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.h
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.h
 2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.h
 2007-04-25 11:28:46 UTC (rev 1834)
@@ -30,9 +30,9 @@
 
 
 
-  gint window_incoming_init (MOKO_DIALER_APP_DATA * p_dialer_data);
+  gint window_incoming_init (MokoDialerData * p_dialer_data);
 
-  void window_incoming_prepare (MOKO_DIALER_APP_DATA * appdata);
+  void window_incoming_prepare (MokoDialerData * appdata);
 #ifdef __cplusplus
 }
 #endif

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
 2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.c
 2007-04-25 11:28:46 UTC (rev 1834)
@@ -38,10 +38,10 @@
 #include "openmoko-dialer-window-talking.h"
 
 /* function declerations */
-void window_outgoing_setup_timer (MOKO_DIALER_APP_DATA * appdata);
+void window_outgoing_setup_timer (MokoDialerData * appdata);
 
 void
-cb_speaker_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
+cb_speaker_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   DBG_ENTER ();
   //moko_dialer_status_update_icon(appdata->status_outgoing);
@@ -66,7 +66,7 @@
 }
 
 void
-cb_redial_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
+cb_redial_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   DBG_ENTER ();
   gtk_widget_hide (appdata->buttonRedial);
@@ -87,7 +87,7 @@
 }
 
 void
-cb_cancel_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
+cb_cancel_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   DBG_ENTER ();
   /* TODO: MokoGsmdConnection->hangup
@@ -100,7 +100,7 @@
 }
 
 void
-window_outgoing_prepare (MOKO_DIALER_APP_DATA * appdata)
+window_outgoing_prepare (MokoDialerData * appdata)
 {
   DBG_ENTER ();
   if (appdata->window_outgoing == 0)
@@ -129,7 +129,7 @@
 }
 
 void
-window_outgoing_fails (MOKO_DIALER_APP_DATA * appdata)
+window_outgoing_fails (MokoDialerData * appdata)
 {
   DBG_ENTER ();
   moko_dialer_status_set_error (appdata->status_outgoing);
@@ -141,7 +141,7 @@
 }
 
 gint
-timer_outgoing_time_out (MOKO_DIALER_APP_DATA * appdata)
+timer_outgoing_time_out (MokoDialerData * appdata)
 {
 //DBG_ENTER();
   TIMER_DATA *timer_data = &(appdata->g_timer_data);
@@ -180,7 +180,7 @@
 
 
 void
-on_window_outgoing_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
+on_window_outgoing_hide (GtkWidget * widget, MokoDialerData * appdata)
 {
   if (appdata->g_timer_data.ptimer != 0)
   {
@@ -203,7 +203,7 @@
 }
 
 void
-window_outgoing_setup_timer (MOKO_DIALER_APP_DATA * appdata)
+window_outgoing_setup_timer (MokoDialerData * appdata)
 {
   time_t timep;
   struct tm *p;
@@ -232,7 +232,7 @@
 }
 
 void
-on_window_outgoing_show (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
+on_window_outgoing_show (GtkWidget * widget, MokoDialerData * appdata)
 {
 
   //DBG_ENTER ();
@@ -251,7 +251,7 @@
 
 
 gint
-window_outgoing_init (MOKO_DIALER_APP_DATA * p_dialer_data)
+window_outgoing_init (MokoDialerData * p_dialer_data)
 {
 
   DBG_ENTER ();

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.h
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.h
 2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-outgoing.h
 2007-04-25 11:28:46 UTC (rev 1834)
@@ -28,9 +28,9 @@
 {
 #endif
 
-  gint window_outgoing_init (MOKO_DIALER_APP_DATA * p_dialer_data);
-  void window_outgoing_prepare (MOKO_DIALER_APP_DATA * appdata);
-  void window_outgoing_fails (MOKO_DIALER_APP_DATA * appdata);
+  gint window_outgoing_init (MokoDialerData * p_dialer_data);
+  void window_outgoing_prepare (MokoDialerData * appdata);
+  void window_outgoing_fails (MokoDialerData * appdata);
 
 #ifdef __cplusplus
 }

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c
      2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.c
      2007-04-25 11:28:46 UTC (rev 1834)
@@ -29,7 +29,7 @@
 #include "openmoko-dialer-main.h"
 
 void
-pin_delete_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
+pin_delete_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   if (appdata->int_sim_pin_end_point)
   {
@@ -42,7 +42,7 @@
 
 
 void
-pin_ok_button_clicked (GtkButton * button, MOKO_DIALER_APP_DATA * appdata)
+pin_ok_button_clicked (GtkButton * button, MokoDialerData * appdata)
 {
   //   gchar *codesinput;
 //    codesinput =g_strdup(moko_dialer_textview_get_input 
(appdata->moko_pin_text_view, TRUE));
@@ -76,7 +76,7 @@
   input[1] = 0;
 
 //DBG_TRACE();
-  MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *appdata = (MokoDialerData *) user_data;
   MokoDialerTextview *moko_pin_text_view = appdata->moko_pin_text_view;
   if (appdata->int_sim_pin_end_point < MOKO_DIALER_MAX_NUMBER_LEN)
   {
@@ -94,14 +94,14 @@
 }
 
 void
-on_window_pin_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
+on_window_pin_hide (GtkWidget * widget, MokoDialerData * appdata)
 {
   appdata->window_present = 0;
 
 }
 
 void
-on_window_pin_show (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
+on_window_pin_show (GtkWidget * widget, MokoDialerData * appdata)
 {
   DBG_ENTER ();
   appdata->window_present = widget;
@@ -113,7 +113,7 @@
 
 
 gint
-window_pin_init (MOKO_DIALER_APP_DATA * p_dialer_data)
+window_pin_init (MokoDialerData * p_dialer_data)
 {
 
   if (!p_dialer_data->window_pin)

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.h
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.h
      2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-pin.h
      2007-04-25 11:28:46 UTC (rev 1834)
@@ -28,7 +28,7 @@
 {
 #endif
 
-  gint window_pin_init (MOKO_DIALER_APP_DATA * p_dialer_data);
+  gint window_pin_init (MokoDialerData * p_dialer_data);
 
 #ifdef __cplusplus
 }

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
  2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.c
  2007-04-25 11:28:46 UTC (rev 1834)
@@ -39,7 +39,7 @@
 
 void
 openmoko_wheel_press_left_up_cb (GtkWidget * widget,
-                                 MOKO_DIALER_APP_DATA * appdata)
+                                 MokoDialerData * appdata)
 {
   DBG_ENTER ();
   gint l, r;
@@ -59,7 +59,7 @@
 
 void
 openmoko_wheel_press_right_down_cb (GtkWidget * widget,
-                                    MOKO_DIALER_APP_DATA * appdata)
+                                    MokoDialerData * appdata)
 {
   gint l, r;
   alsa_get_volume (&l, &r);
@@ -73,14 +73,14 @@
 
 void
 cb_tool_button_speaker_clicked (GtkButton * button,
-                                MOKO_DIALER_APP_DATA * appdata)
+                                MokoDialerData * appdata)
 {
   DBG_ENTER ();
 }
 
 void
 cb_tool_button_dtmf_talk_clicked (GtkButton * button,
-                                  MOKO_DIALER_APP_DATA * appdata)
+                                  MokoDialerData * appdata)
 {
   DBG_ENTER ();
 
@@ -109,7 +109,7 @@
 
 void
 cb_tool_button_hangup_clicked (GtkButton * button,
-                               MOKO_DIALER_APP_DATA * appdata)
+                               MokoDialerData * appdata)
 {
   /* TODO: MokoGsmdConnection->hangup
    * gsm_hangup ();
@@ -127,7 +127,7 @@
   input[1] = 0;
 
 
-  MOKO_DIALER_APP_DATA *appdata = (MOKO_DIALER_APP_DATA *) user_data;
+  MokoDialerData *appdata = (MokoDialerData *) user_data;
   MokoDialerTextview *moko_dtmf_text_view = appdata->moko_dtmf_text_view;
 
   moko_dialer_textview_insert (moko_dtmf_text_view, input);
@@ -143,7 +143,7 @@
 
 
 void
-window_talking_prepare (MOKO_DIALER_APP_DATA * appdata)
+window_talking_prepare (MokoDialerData * appdata)
 {
   DBG_ENTER ();
 
@@ -181,7 +181,7 @@
 }
 
 gint
-timer_talking_time_out (MOKO_DIALER_APP_DATA * appdata)
+timer_talking_time_out (MokoDialerData * appdata)
 {
 //DBG_ENTER();
   TIMER_DATA *timer_data = &(appdata->g_timer_data);
@@ -216,7 +216,7 @@
 }
 
 void
-on_window_talking_hide (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
+on_window_talking_hide (GtkWidget * widget, MokoDialerData * appdata)
 {
 
 
@@ -241,7 +241,7 @@
 }
 
 void
-on_window_talking_show (GtkWidget * widget, MOKO_DIALER_APP_DATA * appdata)
+on_window_talking_show (GtkWidget * widget, MokoDialerData * appdata)
 {
   DBG_ENTER ();
 
@@ -289,7 +289,7 @@
 
 
 gint
-window_talking_init (MOKO_DIALER_APP_DATA * p_dialer_data)
+window_talking_init (MokoDialerData * p_dialer_data)
 {
 
   DBG_ENTER ();

Modified: 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.h
===================================================================
--- 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.h
  2007-04-25 11:04:05 UTC (rev 1833)
+++ 
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-talking.h
  2007-04-25 11:28:46 UTC (rev 1834)
@@ -30,9 +30,9 @@
 
 
 
-  gint window_talking_init (MOKO_DIALER_APP_DATA * p_dialer_data);
+  gint window_talking_init (MokoDialerData * p_dialer_data);
 
-  void window_talking_prepare (MOKO_DIALER_APP_DATA * appdata);
+  void window_talking_prepare (MokoDialerData * appdata);
 #ifdef __cplusplus
 }
 #endif

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

Reply via email to