r2780 - in trunk/src/target/OM-2007.2/libraries: libmokogsmd2 libmokogsmd2/libmokogsmd libmokojournal2 libmokojournal2/mokojournal libmokoui2 libmokoui2/libmokoui

zecke at sita.openmoko.org zecke at sita.openmoko.org
Wed Aug 22 16:36:58 CEST 2007


Author: zecke
Date: 2007-08-22 16:36:56 +0200 (Wed, 22 Aug 2007)
New Revision: 2780

Modified:
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
   trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
   trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
   trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
   trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
   trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.h
Log:
libmokogsmd2:
2007-08-22  Holger Freyther  <zecke at selfish.org>

        Rubberstamped by Mickey.

        Change the hethat way.ader to help h2def.py find GObjects. Please keep
        this that way.

        * libmokogsmd/moko-gsmd-connection.h:


libmokojournal2:
2007-08-22  Holger Freyther  <zecke at selfish.org>

        Rubberstamped by Mickey.

        Change the hethat way.ader to help h2def.py find GObjects. Please keep
        this that way.

        Use a typedef for the enum's just like Gtk+ and Pango.

        * mokojournal/moko-journal.c:
        (entry_type_to_string):
        (moko_journal_entry_type_is_valid):
        (moko_journal_entry_to_icalcomponent):
        (icalcomponent_to_entry):
        (moko_journal_entry_new):
        (moko_journal_entry_set_type):
        (moko_journal_entry_get_direction):
        (moko_journal_entry_set_direction):
        * mokojournal/moko-journal.h:

libmokoui2:
2007-08-22  Holger Freyther  <zecke at selfish.org>

        Rubberstamped by Mickey.

        Change the hethat way.ader to help h2def.py find GObjects. Please keep
        this that way.

        * libmokoui/moko-finger-scroll.h:



Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog	2007-08-22 14:24:30 UTC (rev 2779)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog	2007-08-22 14:36:56 UTC (rev 2780)
@@ -1,3 +1,12 @@
+2007-08-22  Holger Freyther  <zecke at selfish.org>
+
+        Rubberstamped by Mickey.
+
+        Change the hethat way.ader to help h2def.py find GObjects. Please keep
+        this that way.
+
+        * libmokogsmd/moko-gsmd-connection.h:
+
 2007-08-20  Daniel Willmann  <daniel at totalueberwachung.de>
 
 	* libmokogsmd/moko-gsmd-connection.c:

Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h	2007-08-22 14:24:30 UTC (rev 2779)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.h	2007-08-22 14:36:56 UTC (rev 2780)
@@ -23,29 +23,20 @@
 G_BEGIN_DECLS
 
 #define MOKO_TYPE_GSMD_CONNECTION moko_gsmd_connection_get_type()
-
-#define MOKO_GSMD_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-        MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnection))
-
-#define MOKO_GSMD_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \
-        MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnectionClass))
-
-#define MOKO_IS_GSMD_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-        MOKO_TYPE_GSMD_CONNECTION))
-
-#define MOKO_IS_GSMD_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),\
-        MOKO_TYPE_GSMD_CONNECTION))
-
+#define MOKO_GSMD_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnection))
+#define MOKO_GSMD_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnectionClass))
+#define MOKO_IS_GSMD_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_GSMD_CONNECTION))
+#define MOKO_IS_GSMD_CONNECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_GSMD_CONNECTION))
 #define MOKO_GSMD_CONNECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOKO_TYPE_GSMD_CONNECTION, MokoGsmdConnectionClass))
 
-typedef struct 
-{
+typedef struct _MokoGsmdConnection MokoGsmdConnection;
+typedef struct _MokoGsmdConnectionClass MokoGsmdConnectionClass;
+
+struct _MokoGsmdConnection {
     GObject parent;
+};
 
-} MokoGsmdConnection;
-
-typedef struct 
-{
+struct _MokoGsmdConnectionClass {
     GObjectClass parent_class;
 
     /* Voice signals */
@@ -72,9 +63,9 @@
     void (*_moko_gsmdconn_3) (void);
     void (*_moko_gsmdconn_4) (void);
 
-} MokoGsmdConnectionClass;
+};
 
-enum 
+typedef enum 
 {
     MOKO_GSMD_CONNECTION_NETREG_NONE = 0,
     MOKO_GSMD_CONNECTION_NETREG_HOME = 1,
@@ -85,7 +76,7 @@
 } MokoGsmdConnectionNetregType;
 
 
-enum 
+typedef enum 
 {
   MOKO_GSMD_PROG_SETUP = 0,
   MOKO_GSMD_PROG_DISCONNECT = 1,

Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog	2007-08-22 14:24:30 UTC (rev 2779)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/ChangeLog	2007-08-22 14:36:56 UTC (rev 2780)
@@ -1,3 +1,23 @@
+2007-08-22  Holger Freyther  <zecke at selfish.org>
+
+        Rubberstamped by Mickey.
+
+        Change the hethat way.ader to help h2def.py find GObjects. Please keep
+        this that way.
+
+        Use a typedef for the enum's just like Gtk+ and Pango.
+
+        * mokojournal/moko-journal.c:
+        (entry_type_to_string):
+        (moko_journal_entry_type_is_valid):
+        (moko_journal_entry_to_icalcomponent):
+        (icalcomponent_to_entry):
+        (moko_journal_entry_new):
+        (moko_journal_entry_set_type):
+        (moko_journal_entry_get_direction):
+        (moko_journal_entry_set_direction):
+        * mokojournal/moko-journal.h:
+
 2007-08-13  Neil J. Patel  <njp at o-hand.com>
 
 	* Makefile.am:

Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c	2007-08-22 14:24:30 UTC (rev 2779)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.c	2007-08-22 14:36:56 UTC (rev 2780)
@@ -81,11 +81,11 @@
 
 struct _MokoJournalEntry
 {
-  enum MokoJournalEntryType type;
+  MokoJournalEntryType type;
   gchar *uid ;
   gchar *contact_uid ;
   gchar *summary ;
-  enum MessageDirection direction ;
+  MessageDirection direction ;
   MokoTime *dtstart ;
   MokoTime *dtend ;
   float start_longitude ;
@@ -107,7 +107,7 @@
 
 struct _MokoJournalEntryInfo
 {
-  enum MokoJournalEntryType type;
+  MokoJournalEntryType type;
   const gchar *type_as_string ;
 };
 typedef struct _MokoJournalEntryInfo MokoJournalEntryInfo ;
@@ -148,10 +148,10 @@
                                                   const gchar *a_uid,
                                                   MokoJournalEntry **a_entry,
                                                   int *a_offset) ;
-static const gchar* entry_type_to_string (enum MokoJournalEntryType a_type) ;
-static enum MokoJournalEntryType entry_type_from_string (const gchar* a_str) ;
+static const gchar* entry_type_to_string (MokoJournalEntryType a_type) ;
+static MokoJournalEntryType entry_type_from_string (const gchar* a_str) ;
 static gboolean moko_journal_entry_type_is_valid
-                                          (enum MokoJournalEntryType a_type) ;
+                                          (MokoJournalEntryType a_type) ;
 static gboolean moko_journal_entry_to_icalcomponent (MokoJournalEntry *a_entry,
                                                      icalcomponent **a_comp) ;
 static gboolean icalcomponent_to_entry (icalcomponent *a_comp,
@@ -256,7 +256,7 @@
 }
 
 static const gchar*
-entry_type_to_string (enum MokoJournalEntryType a_type)
+entry_type_to_string (MokoJournalEntryType a_type)
 {
   MokoJournalEntryInfo *cur ;
 
@@ -268,7 +268,7 @@
   return NULL ;
 }
 
-static enum MokoJournalEntryType
+static MokoJournalEntryType
 entry_type_from_string (const gchar* a_str)
 {
   MokoJournalEntryInfo *cur ;
@@ -582,7 +582,7 @@
 }
 
 static gboolean
-moko_journal_entry_type_is_valid (enum MokoJournalEntryType a_type)
+moko_journal_entry_type_is_valid (MokoJournalEntryType a_type)
 {
   if (a_type > 0 && a_type < NB_OF_ENTRY_TYPES)
     return TRUE ;
@@ -597,7 +597,7 @@
   icalproperty *prop = NULL ;
   gboolean result = FALSE ;
   gchar *str=NULL ;
-  enum MessageDirection dir = DIRECTION_IN ;
+  MessageDirection dir = DIRECTION_IN ;
 
   g_return_val_if_fail (a_entry, FALSE) ;
   g_return_val_if_fail (a_comp, FALSE) ;
@@ -770,7 +770,7 @@
   if (icalcomponent_find_property_as_string (a_comp, "X-OPENMOKO-ENTRY-TYPE",
                                              &prop_value))
   {
-    enum MokoJournalEntryType entry_type = UNDEF_ENTRY ;
+    MokoJournalEntryType entry_type = UNDEF_ENTRY ;
     if (!prop_value)
     {
       g_warning ("could not get entry type") ;
@@ -1580,7 +1580,7 @@
  * Return value: the newly created journal entry object
  */
 MokoJournalEntry*
-moko_journal_entry_new (enum MokoJournalEntryType a_type)
+moko_journal_entry_new (MokoJournalEntryType a_type)
 {
   MokoJournalEntry *result ;
   result = moko_journal_entry_alloc () ;
@@ -1596,7 +1596,7 @@
  *
  * Return value: the type of the journal entry
  */
-enum MokoJournalEntryType
+MokoJournalEntryType
 moko_journal_entry_get_entry_type (MokoJournalEntry *a_entry)
 {
   g_return_val_if_fail (a_entry, UNDEF_ENTRY) ;
@@ -1614,7 +1614,7 @@
  */
 void
 moko_journal_entry_set_type (MokoJournalEntry *a_entry,
-                             enum MokoJournalEntryType a_type)
+                             MokoJournalEntryType a_type)
 {
   g_return_if_fail (a_entry) ;
   g_return_if_fail (a_type != UNDEF_ENTRY) ;
@@ -1794,7 +1794,7 @@
  */
 gboolean
 moko_journal_entry_get_direction (MokoJournalEntry *a_entry,
-                                  enum MessageDirection *a_direction)
+                                  MessageDirection *a_direction)
 {
   g_return_val_if_fail (a_entry, FALSE) ;
   g_return_val_if_fail (a_direction, FALSE) ;
@@ -1812,7 +1812,7 @@
  *
  */
 void moko_journal_entry_set_direction (MokoJournalEntry *a_entry,
-                                       enum MessageDirection direction)
+                                       MessageDirection direction)
 {
   g_return_if_fail (a_entry) ;
 

Modified: trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h	2007-08-22 14:24:30 UTC (rev 2779)
+++ trunk/src/target/OM-2007.2/libraries/libmokojournal2/mokojournal/moko-journal.h	2007-08-22 14:36:56 UTC (rev 2780)
@@ -19,7 +19,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 #ifndef __MOKO_JOURNAL_H__
-#define  __MOKO_JOURNAL_H__
+#define __MOKO_JOURNAL_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -66,7 +66,7 @@
  * this represents the primary type of
  * a journal entry.
  */
-enum MokoJournalEntryType {
+typedef enum {
   UNDEF_ENTRY=0,
   EMAIL_JOURNAL_ENTRY,
   /*sms calls*/
@@ -78,12 +78,12 @@
   /*data calls (like modems)*/
   DATA_JOURNAL_ENTRY,
   NB_OF_ENTRY_TYPES /*must always be the last*/
-} ;
+} MokoJournalEntryType ;
 
-enum MessageDirection {
+typedef enum {
   DIRECTION_IN=0,
   DIRECTION_OUT
-};
+} MessageDirection ;
 
 typedef struct
 {
@@ -221,7 +221,7 @@
  *
  * Return value: the newly created journal entry object
  */
-MokoJournalEntry* moko_journal_entry_new (enum MokoJournalEntryType type) ;
+MokoJournalEntry* moko_journal_entry_new (MokoJournalEntryType type) ;
 
 /**
  * moko_journal_entry_get_entry_type:
@@ -231,7 +231,7 @@
  *
  * Return value: the type of the journal entry
  */
-enum MokoJournalEntryType moko_journal_entry_get_entry_type (MokoJournalEntry *entry);
+MokoJournalEntryType moko_journal_entry_get_entry_type (MokoJournalEntry *entry);
 
 /**
  * moko_journal_entry_set_type:
@@ -241,7 +241,7 @@
  * Set the type of the journal entry
  */
 void moko_journal_entry_set_type (MokoJournalEntry *entry,
-                                  enum MokoJournalEntryType type) ;
+                                  MokoJournalEntryType type) ;
 
 /**
  * moko_journal_entry_get_uid:
@@ -338,7 +338,7 @@
  * Returns: TRUE in case of success, FALSE otherwise.
  */
 gboolean moko_journal_entry_get_direction (MokoJournalEntry *entry,
-                                           enum MessageDirection *direction) ;
+                                           MessageDirection *direction) ;
 
 /**
  * moko_journal_entry_set_direction:
@@ -349,7 +349,7 @@
  *
  */
 void moko_journal_entry_set_direction (MokoJournalEntry *entry,
-                                       enum MessageDirection direction) ;
+                                       MessageDirection direction) ;
 
 /**
  * moko_journal_entry_get_dtdstart:

Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog	2007-08-22 14:24:30 UTC (rev 2779)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog	2007-08-22 14:36:56 UTC (rev 2780)
@@ -1,3 +1,12 @@
+2007-08-22  Holger Freyther  <zecke at selfish.org>
+
+        Rubberstamped by Mickey.
+
+        Change the hethat way.ader to help h2def.py find GObjects. Please keep
+        this that way.
+
+        * libmokoui/moko-finger-scroll.h:
+
 2007-08-15  Thomas Wood  <thomas at openedhand.com>
 
 	* libmokoui/moko-stock.c: (_moko_stock_add_icon): Add a hack to make sure we

Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.h
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.h	2007-08-22 14:24:30 UTC (rev 2779)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/libmokoui/moko-finger-scroll.h	2007-08-22 14:36:56 UTC (rev 2780)
@@ -26,34 +26,22 @@
 G_BEGIN_DECLS
 
 #define MOKO_TYPE_FINGER_SCROLL moko_finger_scroll_get_type()
+#define MOKO_FINGER_SCROLL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MOKO_TYPE_FINGER_SCROLL, MokoFingerScroll))
+#define MOKO_FINGER_SCROLL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MOKO_TYPE_FINGER_SCROLL, MokoFingerScrollClass))
+#define MOKO_IS_FINGER_SCROLL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MOKO_TYPE_FINGER_SCROLL))
+#define MOKO_IS_FINGER_SCROLL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MOKO_TYPE_FINGER_SCROLL))
+#define MOKO_FINGER_SCROLL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MOKO_TYPE_FINGER_SCROLL, MokoFingerScrollClass))
 
-#define MOKO_FINGER_SCROLL(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
-  MOKO_TYPE_FINGER_SCROLL, MokoFingerScroll))
+typedef struct _MokoFingerScroll MokoFingerScroll;
+typedef struct _MokoFingerScrollClass MokoFingerScrollClass;
 
-#define MOKO_FINGER_SCROLL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), \
-  MOKO_TYPE_FINGER_SCROLL, MokoFingerScrollClass))
-
-#define MOKO_IS_FINGER_SCROLL(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
-  MOKO_TYPE_FINGER_SCROLL))
-
-#define MOKO_IS_FINGER_SCROLL_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), \
-  MOKO_TYPE_FINGER_SCROLL))
-
-#define MOKO_FINGER_SCROLL_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), \
-  MOKO_TYPE_FINGER_SCROLL, MokoFingerScrollClass))
-
-typedef struct {
+struct _MokoFingerScroll {
   GtkEventBox parent;
-} MokoFingerScroll;
+};
 
-typedef struct {
+struct _MokoFingerScrollClass {
   GtkEventBoxClass parent_class;
-} MokoFingerScrollClass;
+};
 
 typedef enum {
 	MOKO_FINGER_SCROLL_MODE_PUSH,





More information about the commitlog mailing list