From 5c6dbfb04a92367bd37992f87e2ce6658dad9d3a Mon Sep 17 00:00:00 2001
From: Yevgen Muntyan <17531749+muntyan@users.noreply.github.com>
Date: Mon, 13 Mar 2006 01:03:57 -0600
Subject: [PATCH] Little cleanup

---
 moo/mooapp/mooapp.c                   | 27 ++++++++++----
 moo/mooapp/mooapp.h                   |  3 +-
 moo/moopython/pygtk/mooapp-pygtk.defs | 54 ++++++++++++++++++++++++---
 3 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/moo/mooapp/mooapp.c b/moo/mooapp/mooapp.c
index 6fcfb986..9148e22d 100644
--- a/moo/mooapp/mooapp.c
+++ b/moo/mooapp/mooapp.c
@@ -564,13 +564,6 @@ moo_app_set_argv (MooApp         *app,
 }
 
 
-int
-moo_app_get_exit_code (MooApp      *app)
-{
-    g_return_val_if_fail (MOO_IS_APP (app), -1);
-    return app->priv->exit_code;
-}
-
 void
 moo_app_set_exit_code (MooApp      *app,
                        int          code)
@@ -1647,3 +1640,23 @@ moo_app_tempnam (MooApp     *app)
     g_warning ("%s: could not generate temp file name", G_STRLOC);
     return NULL;
 }
+
+
+GType
+moo_app_data_type_get_type (void)
+{
+    static GType type = 0;
+
+    if (!type)
+    {
+        static const GEnumValue values[] = {
+            { MOO_APP_DATA_SHARE, (char*) "MOO_APP_DATA_SHARE", (char*) "share" },
+            { MOO_APP_DATA_LIB, (char*) "MOO_APP_DATA_LIB", (char*) "lib" },
+            { 0, NULL, NULL },
+        };
+
+        type = g_enum_register_static ("MooAppDataType", values);
+    }
+
+    return type;
+}
diff --git a/moo/mooapp/mooapp.h b/moo/mooapp/mooapp.h
index 3da87175..d59788d9 100644
--- a/moo/mooapp/mooapp.h
+++ b/moo/mooapp/mooapp.h
@@ -21,6 +21,7 @@ G_BEGIN_DECLS
 
 
 #define MOO_TYPE_APP_INFO           (moo_app_info_get_type ())
+#define MOO_TYPE_APP_DATA_TYPE      (moo_app_data_type_get_type ())
 
 #define MOO_TYPE_APP                (moo_app_get_type ())
 #define MOO_APP(object)             (G_TYPE_CHECK_INSTANCE_CAST ((object), MOO_TYPE_APP, MooApp))
@@ -79,6 +80,7 @@ struct _MooAppClass
 
 GType            moo_app_get_type               (void) G_GNUC_CONST;
 GType            moo_app_info_get_type          (void) G_GNUC_CONST;
+GType            moo_app_data_type_get_type     (void) G_GNUC_CONST;
 
 MooApp          *moo_app_get_instance           (void);
 
@@ -86,7 +88,6 @@ gboolean         moo_app_init                   (MooApp     *app);
 int              moo_app_run                    (MooApp     *app);
 gboolean         moo_app_quit                   (MooApp     *app);
 
-int              moo_app_get_exit_code          (MooApp     *app);
 void             moo_app_set_exit_code          (MooApp     *app,
                                                  int         code);
 
diff --git a/moo/moopython/pygtk/mooapp-pygtk.defs b/moo/moopython/pygtk/mooapp-pygtk.defs
index 6f881e4b..6ca1fe15 100644
--- a/moo/moopython/pygtk/mooapp-pygtk.defs
+++ b/moo/moopython/pygtk/mooapp-pygtk.defs
@@ -25,6 +25,15 @@
 ;;   )
 ;; )
 
+(define-enum DataType
+  (in-module "Moo")
+  (c-name "MooAppDataType")
+  (gtype-id "MOO_TYPE_APP_DATA_TYPE")
+  (values
+    '("share" "MOO_APP_DATA_SHARE")
+    '("lib" "MOO_APP_DATA_LIB")
+  )
+)
 
 ;; From mooapp.h
 
@@ -51,12 +60,6 @@
   (return-type "gboolean")
 )
 
-(define-method get_exit_code
-  (of-object "MooApp")
-  (c-name "moo_app_get_exit_code")
-  (return-type "int")
-)
-
 (define-method set_exit_code
   (of-object "MooApp")
   (c-name "moo_app_set_exit_code")
@@ -142,3 +145,42 @@
     '("int" "len")
   )
 )
+
+(define-method get_data_dir
+  (of-object "MooApp")
+  (c-name "moo_app_get_data_dir")
+  (return-type "char*")
+  (parameters
+    '("MooAppDataType" "type")
+  )
+)
+
+(define-method get_user_data_dir
+  (of-object "MooApp")
+  (c-name "moo_app_get_user_data_dir")
+  (return-type "char*")
+  (parameters
+    '("MooAppDataType" "type")
+  )
+)
+
+(define-method get_data_dirs
+  (of-object "MooApp")
+  (c-name "moo_app_get_data_dirs")
+  (return-type "char*")
+  (parameters
+    '("MooAppDataType" "type")
+    '("guint*" "n_dirs")
+  )
+)
+
+(define-method get_data_subdirs
+  (of-object "MooApp")
+  (c-name "moo_app_get_data_subdirs")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "subdir")
+    '("MooAppDataType" "type")
+    '("guint*" "n_dirs")
+  )
+)