[clutter/android-enter-leave: 27/29] android: expose cluttter_android_application_get_default()



commit 799e8b51dcd062293dbebb458577da254c556b0f
Author: Lionel Landwerlin <llandwerlin gmail com>
Date:   Tue Jun 26 12:07:54 2012 +0100

    android: expose cluttter_android_application_get_default()

 .../android/clutter-android-application-private.h  |    2 --
 clutter/android/clutter-android-application.c      |    8 ++++----
 clutter/android/clutter-android-application.h      |    2 ++
 clutter/android/clutter-stage-android.c            |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/clutter/android/clutter-android-application-private.h b/clutter/android/clutter-android-application-private.h
index e51d701..13ee846 100644
--- a/clutter/android/clutter-android-application-private.h
+++ b/clutter/android/clutter-android-application-private.h
@@ -43,6 +43,4 @@ struct _ClutterAndroidApplication
   GMainLoop *wait_for_window;
 };
 
-ClutterAndroidApplication *_clutter_android_application_get_default (void);
-
 #endif /* __CLUTTER_ANDROID_APPLICATION_PRIVATE_H__ */
diff --git a/clutter/android/clutter-android-application.c b/clutter/android/clutter-android-application.c
index 3e2d803..e237a8b 100644
--- a/clutter/android/clutter-android-application.c
+++ b/clutter/android/clutter-android-application.c
@@ -123,7 +123,7 @@ clutter_android_application_init (ClutterAndroidApplication *self)
 }
 
 ClutterAndroidApplication *
-_clutter_android_application_get_default (void)
+clutter_android_application_get_default (void)
 {
   static ClutterAndroidApplication *app = NULL;
 
@@ -422,7 +422,7 @@ translate_motion_event (AInputEvent *a_event)
 {
   int32_t source = AInputEvent_getSource (a_event);
   ClutterAndroidApplication *application =
-    _clutter_android_application_get_default ();
+    clutter_android_application_get_default ();
 
   if ((source != AINPUT_SOURCE_MOUSE) &&
       application->touch_enabled)
@@ -440,7 +440,7 @@ translate_key_event (AInputEvent *a_event)
   ClutterDeviceManager *manager;
   ClutterInputDevice *keyboard_device;
   ClutterAndroidApplication *application =
-    _clutter_android_application_get_default ();
+    clutter_android_application_get_default ();
   int32_t new_modifier_state = application->modifier_state;
 
   action = AKeyEvent_getAction (a_event);
@@ -613,7 +613,7 @@ android_main (struct android_app* android_application)
   g_type_init ();
   g_android_init ();
 
-  clutter_application = _clutter_android_application_get_default ();
+  clutter_application = clutter_android_application_get_default ();
 
   android_application->userData = clutter_application;
   android_application->onAppCmd = clutter_android_handle_cmd;
diff --git a/clutter/android/clutter-android-application.h b/clutter/android/clutter-android-application.h
index 8df2dfa..3175956 100644
--- a/clutter/android/clutter-android-application.h
+++ b/clutter/android/clutter-android-application.h
@@ -70,6 +70,8 @@ void clutter_android_main (ClutterAndroidApplication *application);
 
 GType clutter_android_application_get_type (void) G_GNUC_CONST;
 
+ClutterAndroidApplication *clutter_android_application_get_default (void);
+
 void clutter_android_application_show_keyboard (ClutterAndroidApplication *application,
                                                 gboolean show_keyboard,
                                                 gboolean implicit);
diff --git a/clutter/android/clutter-stage-android.c b/clutter/android/clutter-stage-android.c
index 8bc6292..d539811 100644
--- a/clutter/android/clutter-stage-android.c
+++ b/clutter/android/clutter-stage-android.c
@@ -69,7 +69,7 @@ clutter_stage_android_set_fullscreen (ClutterStageWindow *stage_window,
   if (_clutter_stage_is_fullscreen (stage) == is_fullscreen)
     return;
 
-  application = _clutter_android_application_get_default ();
+  application = clutter_android_application_get_default ();
 
   if (is_fullscreen)
     {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]