GNOME.org
 

[gtk+/xi2-for-master] Fix make check

commit dc332b1551b89bae578c569eab2b17bc3f85b9de
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon May 24 17:30:20 2010 -0400

    Fix make check
    
    Clean symbol exports.

 gdk/gdk.symbols                 |    5 +++++
 gdk/gdkdevice.c                 |    2 +-
 gdk/x11/gdkdevice-core.c        |    2 +-
 gdk/x11/gdkdevice-core.h        |    1 +
 gdk/x11/gdkdevice-xi.c          |    2 +-
 gdk/x11/gdkdevice-xi.h          |    4 ++++
 gdk/x11/gdkdevice-xi2.c         |    2 +-
 gdk/x11/gdkdevice-xi2.h         |    3 +++
 gdk/x11/gdkdevicemanager-core.h |    1 +
 gdk/x11/gdkdevicemanager-xi.h   |    1 +
 gdk/x11/gdkdevicemanager-xi2.h  |    1 +
 gdk/x11/gdkeventsource.h        |    3 +++
 gdk/x11/gdkeventtranslator.h    |    5 ++++-
 gdk/x11/gdkmain-x11.c           |    2 +-
 gdk/x11/gdkprivate-x11.h        |    2 +-
 15 files changed, 29 insertions(+), 7 deletions(-)
---
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index fe47daf..dc887b7 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -404,7 +404,9 @@ gdk_device_free_history
 gdk_device_get_associated_device
 gdk_device_get_axis
 gdk_device_get_axis_use
+gdk_device_get_axis_value
 gdk_device_get_device_type
+gdk_device_get_display
 gdk_device_get_has_cursor
 gdk_device_get_history
 gdk_device_get_key
@@ -414,6 +416,7 @@ gdk_device_get_name
 gdk_device_get_source
 gdk_device_get_type G_GNUC_CONST
 gdk_device_get_state
+gdk_device_list_axes
 gdk_device_set_axis_use
 gdk_device_set_key
 gdk_device_set_mode
@@ -463,6 +466,8 @@ gdk_display_get_window_at_pointer
 gdk_display_keyboard_ungrab
 gdk_display_pointer_ungrab
 gdk_display_set_pointer_hooks
+gdk_display_set_device_hooks
+gdk_display_device_is_grabbed
 #ifndef GDK_DISABLE_DEPRECATED
 gdk_display_get_core_pointer
 #endif
diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 74115b7..142f63d 100644
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -1162,7 +1162,7 @@ _gdk_device_set_keys (GdkDevice *device,
   device->keys = g_new0 (GdkDeviceKey, num_keys);
 }
 
-GdkAxisInfo *
+static GdkAxisInfo *
 find_axis_info (GArray     *array,
                 GdkAxisUse  use)
 {
diff --git a/gdk/x11/gdkdevice-core.c b/gdk/x11/gdkdevice-core.c
index b7744ed..7ff8c4d 100644
--- a/gdk/x11/gdkdevice-core.c
+++ b/gdk/x11/gdkdevice-core.c
@@ -359,7 +359,7 @@ gdk_device_core_grab (GdkDevice    *device,
                              time_);
     }
 
-  return gdk_x11_convert_grab_status (status);
+  return _gdk_x11_convert_grab_status (status);
 }
 
 static void
diff --git a/gdk/x11/gdkdevice-core.h b/gdk/x11/gdkdevice-core.h
index 8f53d6f..04424b5 100644
--- a/gdk/x11/gdkdevice-core.h
+++ b/gdk/x11/gdkdevice-core.h
@@ -44,6 +44,7 @@ struct _GdkDeviceCoreClass
   GdkDeviceClass parent_class;
 };
 
+G_GNUC_INTERNAL
 GType gdk_device_core_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
diff --git a/gdk/x11/gdkdevice-xi.c b/gdk/x11/gdkdevice-xi.c
index 0bbbe48..b82ff18 100644
--- a/gdk/x11/gdkdevice-xi.c
+++ b/gdk/x11/gdkdevice-xi.c
@@ -447,7 +447,7 @@ gdk_device_xi_grab (GdkDevice    *device,
                         GrabModeAsync, GrabModeAsync,
                         time_);
 
-  return gdk_x11_convert_grab_status (status);
+  return _gdk_x11_convert_grab_status (status);
 }
 
 static void
diff --git a/gdk/x11/gdkdevice-xi.h b/gdk/x11/gdkdevice-xi.h
index 5f8f586..55f33d3 100644
--- a/gdk/x11/gdkdevice-xi.h
+++ b/gdk/x11/gdkdevice-xi.h
@@ -64,14 +64,18 @@ struct _GdkDeviceXIClass
   GdkDeviceClass parent_class;
 };
 
+G_GNUC_INTERNAL
 GType gdk_device_xi_get_type (void) G_GNUC_CONST;
 
+G_GNUC_INTERNAL
 void     gdk_device_xi_update_window_info (GdkWindow *window);
 
+G_GNUC_INTERNAL
 void     gdk_device_xi_update_axes (GdkDevice *device,
                                     gint       axes_count,
                                     gint       first_axis,
                                     gint      *axis_data);
+G_GNUC_INTERNAL
 void     gdk_device_xi_translate_axes     (GdkDevice *device,
                                            GdkWindow *window,
                                            gint      *axis_data,
diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 71a6ee4..d7bc64e 100644
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/gdk/x11/gdkdevice-xi2.c
@@ -394,7 +394,7 @@ gdk_device_xi2_grab (GdkDevice    *device,
 
   g_free (mask.mask);
 
-  return gdk_x11_convert_grab_status (status);
+  return _gdk_x11_convert_grab_status (status);
 }
 
 static void
diff --git a/gdk/x11/gdkdevice-xi2.h b/gdk/x11/gdkdevice-xi2.h
index e77ab43..67e4dc9 100644
--- a/gdk/x11/gdkdevice-xi2.h
+++ b/gdk/x11/gdkdevice-xi2.h
@@ -48,10 +48,13 @@ struct _GdkDeviceXI2Class
   GdkDeviceClass parent_class;
 };
 
+G_GNUC_INTERNAL
 GType gdk_device_xi2_get_type (void) G_GNUC_CONST;
 
+G_GNUC_INTERNAL
 guchar * gdk_device_xi2_translate_event_mask (GdkEventMask  event_mask,
                                               int          *len);
+G_GNUC_INTERNAL
 guint    gdk_device_xi2_translate_state      (XIModifierState *mods_state,
                                               XIButtonState   *buttons_state);
 
diff --git a/gdk/x11/gdkdevicemanager-core.h b/gdk/x11/gdkdevicemanager-core.h
index 0a337fc..e2f2382 100644
--- a/gdk/x11/gdkdevicemanager-core.h
+++ b/gdk/x11/gdkdevicemanager-core.h
@@ -46,6 +46,7 @@ struct _GdkDeviceManagerCoreClass
   GdkDeviceManagerClass parent_class;
 };
 
+G_GNUC_INTERNAL
 GType gdk_device_manager_core_get_type (void) G_GNUC_CONST;
 
 
diff --git a/gdk/x11/gdkdevicemanager-xi.h b/gdk/x11/gdkdevicemanager-xi.h
index e2028fd..6fd7d6d 100644
--- a/gdk/x11/gdkdevicemanager-xi.h
+++ b/gdk/x11/gdkdevicemanager-xi.h
@@ -50,6 +50,7 @@ struct _GdkDeviceManagerXIClass
   GdkDeviceManagerCoreClass parent_class;
 };
 
+G_GNUC_INTERNAL
 GType gdk_device_manager_xi_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
diff --git a/gdk/x11/gdkdevicemanager-xi2.h b/gdk/x11/gdkdevicemanager-xi2.h
index d47bcdb..f28e62c 100644
--- a/gdk/x11/gdkdevicemanager-xi2.h
+++ b/gdk/x11/gdkdevicemanager-xi2.h
@@ -53,6 +53,7 @@ struct _GdkDeviceManagerXI2Class
   GdkDeviceManagerClass parent_class;
 };
 
+G_GNUC_INTERNAL
 GType gdk_device_manager_xi2_get_type (void) G_GNUC_CONST;
 
 
diff --git a/gdk/x11/gdkeventsource.h b/gdk/x11/gdkeventsource.h
index c1e5239..4fc0dbe 100644
--- a/gdk/x11/gdkeventsource.h
+++ b/gdk/x11/gdkeventsource.h
@@ -27,11 +27,14 @@ G_BEGIN_DECLS
 
 typedef struct _GdkEventSource GdkEventSource;
 
+G_GNUC_INTERNAL
 GSource * gdk_event_source_new            (GdkDisplay *display);
 
+G_GNUC_INTERNAL
 void      gdk_event_source_add_translator (GdkEventSource     *source,
                                            GdkEventTranslator *translator);
 
+G_GNUC_INTERNAL
 void      gdk_event_source_select_events  (GdkEventSource *source,
                                            Window          window,
                                            GdkEventMask    event_mask,
diff --git a/gdk/x11/gdkeventtranslator.h b/gdk/x11/gdkeventtranslator.h
index c6d0acc..e0c28fe 100644
--- a/gdk/x11/gdkeventtranslator.h
+++ b/gdk/x11/gdkeventtranslator.h
@@ -50,13 +50,16 @@ struct _GdkEventTranslatorIface
                                          GdkEventMask        event_mask);
 };
 
+G_GNUC_INTERNAL
 GType      gdk_event_translator_get_type (void) G_GNUC_CONST;
 
+G_GNUC_INTERNAL
 GdkEvent * gdk_event_translator_translate (GdkEventTranslator *translator,
                                            GdkDisplay         *display,
                                            XEvent             *xevent);
-
+G_GNUC_INTERNAL
 GdkEventMask gdk_event_translator_get_handled_events   (GdkEventTranslator *translator);
+G_GNUC_INTERNAL
 void         gdk_event_translator_select_window_events (GdkEventTranslator *translator,
                                                         Window              window,
                                                         GdkEventMask        event_mask);
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 3e46b6b..bf53d65 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -119,7 +119,7 @@ gdk_get_use_xshm (void)
 }
 
 GdkGrabStatus
-gdk_x11_convert_grab_status (gint status)
+_gdk_x11_convert_grab_status (gint status)
 {
   switch (status)
     {
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 0aea073..00cde1b 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -196,7 +196,7 @@ gboolean _gdk_x11_get_xft_setting (GdkScreen   *screen,
 				   const gchar *name,
 				   GValue      *value);
 
-GdkGrabStatus gdk_x11_convert_grab_status (gint status);
+GdkGrabStatus _gdk_x11_convert_grab_status (gint status);
 
 
 extern GdkDrawableClass  _gdk_x11_drawable_class;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]