[maemo-commits] [maemo-commits] r17667 - in projects/haf/trunk/libmatchbox2: . debian matchbox/core

Fri Mar 13 09:42:34 EET 2009

Author: kihamala
Date: 2009-03-13 09:42:32 +0200 (Fri, 13 Mar 2009)
New Revision: 17667

Modified:
   projects/haf/trunk/libmatchbox2/ChangeLog
   projects/haf/trunk/libmatchbox2/debian/changelog
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
   projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h
Log:
stop exporting some internal symbols


Modified: projects/haf/trunk/libmatchbox2/ChangeLog
===================================================================

--- projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-13 06:29:35 UTC (rev 17666)
+++ projects/haf/trunk/libmatchbox2/ChangeLog	2009-03-13 07:42:32 UTC (rev 17667)
@@ -1,3 +1,16 @@
+2009-03-13  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
+
+	Hide some symbols.
+
+	* matchbox/core/mb-window-manager.[ch]: Mark the following functions
+	static: mb_wm_unmanage_client, mb_wm_manage_client, mb_wm_set_layout,
+	mb_wm_set_n_desktops, mb_wm_set_cursor, mb_wm_set_theme.
+
+	Mark the following functions internal to the library (i.e. protected):
+	mb_wm_handle_ping_reply, mb_wm_handle_hang_client,
+	mb_wm_compositing_on, mb_wm_compositing_off,
+	mb_wm_compositing_enabled, mb_wm_select_desktop.
+
 2009-03-12  Thomas Thurman  <thomas.thurman at collabora.co.uk>
 
 	Root window handler gets to examine all the ClientMessages

Modified: projects/haf/trunk/libmatchbox2/debian/changelog
===================================================================
--- projects/haf/trunk/libmatchbox2/debian/changelog	2009-03-13 06:29:35 UTC (rev 17666)
+++ projects/haf/trunk/libmatchbox2/debian/changelog	2009-03-13 07:42:32 UTC (rev 17667)
@@ -1,6 +1,6 @@
 matchbox-window-manager-2 (0.2.22-1~unreleased) unstable; urgency=low
 
-  * WRITEME
+  * Stop exporting some internal symbols.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Fri, 13 Mar 2009 08:25:02 +0200
 

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-03-13 06:29:35 UTC (rev 17666)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.c	2009-03-13 07:42:32 UTC (rev 17667)
@@ -76,6 +76,28 @@
 mb_wm_is_my_window (MBWindowManager *wm, Window xwin,
 		    MBWindowManagerClient **client);
 
+static void
+mb_wm_unmanage_client (MBWindowManager       *wm,
+		       MBWindowManagerClient *client,
+		       Bool                   destroy);
+
+static void
+mb_wm_manage_client (MBWindowManager       *wm,
+		     MBWindowManagerClient *client,
+		     Bool                   activate);
+
+static void
+mb_wm_set_layout (MBWindowManager *wm, MBWMLayout *layout);
+
+static void
+mb_wm_set_n_desktops (MBWindowManager *wm, int n_desktops);
+
+static void
+mb_wm_set_cursor (MBWindowManager * wm, MBWindowManagerCursor cursor);
+
+static void
+mb_wm_set_theme (MBWindowManager *wm, MBWMTheme * theme);
+
 static MBWindowManagerClient*
 mb_wm_client_new_func (MBWindowManager *wm, MBWMClientWindow *win)
 {
@@ -1103,7 +1125,7 @@
     }
 }
 
-void
+static void
 mb_wm_manage_client (MBWindowManager       *wm,
 		     MBWindowManagerClient *client,
 		     Bool                   activate)
@@ -1176,7 +1198,7 @@
  * destroy indicates whether the client, if it is an application,
  * should be destroyed or moved into the iconized category.
  */
-void
+static void
 mb_wm_unmanage_client (MBWindowManager       *wm,
 		       MBWindowManagerClient *client,
 		       Bool                   destroy)
@@ -1883,7 +1905,7 @@
   return mb_wm_stack_get_highest_by_type (wm, MBWMClientTypeApp);
 }
 
-void
+void __attribute__ ((visibility("hidden")))
 mb_wm_handle_ping_reply (MBWindowManager * wm, MBWindowManagerClient *c)
 {
   g_debug ("%s: entered", __FUNCTION__);
@@ -1903,7 +1925,7 @@
     }
 }
 
-void
+void __attribute__ ((visibility("hidden")))
 mb_wm_handle_hang_client (MBWindowManager * wm, MBWindowManagerClient *c)
 {
   MBWindowManagerClass  *wm_klass;
@@ -1948,7 +1970,7 @@
     }
 }
 
-void
+static void
 mb_wm_set_layout (MBWindowManager *wm, MBWMLayout *layout)
 {
   wm->layout = layout;
@@ -2104,7 +2126,7 @@
     }
 }
 
-void
+static void
 mb_wm_set_theme (MBWindowManager *wm, MBWMTheme * theme)
 {
   if (!theme)
@@ -2156,7 +2178,7 @@
   mb_wm_set_theme (wm, theme);
 }
 
-void
+static void
 mb_wm_set_cursor (MBWindowManager * wm, MBWindowManagerCursor cursor)
 {
   static int major = 0, minor = 0, ev_base, err_base;
@@ -2205,7 +2227,7 @@
     wm->cursor = cursor;
 }
 
-void
+void __attribute__ ((visibility("hidden")))
 mb_wm_compositing_on (MBWindowManager * wm)
 {
 #if ENABLE_COMPOSITE
@@ -2224,7 +2246,7 @@
 }
 
 
-void
+void __attribute__ ((visibility("hidden")))
 mb_wm_compositing_off (MBWindowManager * wm)
 {
 #if ENABLE_COMPOSITE
@@ -2233,7 +2255,7 @@
 #endif
 }
 
-Bool
+Bool __attribute__ ((visibility("hidden")))
 mb_wm_compositing_enabled (MBWindowManager * wm)
 {
 #if ENABLE_COMPOSITE
@@ -2249,7 +2271,7 @@
   return wm->modality_type;
 }
 
-void
+static void
 mb_wm_set_n_desktops (MBWindowManager *wm, int n_desktops)
 {
   CARD32 card32 = n_desktops;
@@ -2265,7 +2287,7 @@
 }
 
 
-void
+void __attribute__ ((visibility("hidden")))
 mb_wm_select_desktop (MBWindowManager *wm, int desktop)
 {
   CARD32                 card32 = desktop;

Modified: projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h
===================================================================
--- projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h	2009-03-13 06:29:35 UTC (rev 17666)
+++ projects/haf/trunk/libmatchbox2/matchbox/core/mb-window-manager.h	2009-03-13 07:42:32 UTC (rev 17667)
@@ -168,9 +168,6 @@
 void
 mb_wm_init (MBWindowManager * wm);
 
-void
-mb_wm_set_layout (MBWindowManager *wm, MBWMLayout *layout);
-
 int
 mb_wm_class_type ();
 
@@ -187,16 +184,6 @@
 mb_wm_register_client_type (void);
 
 void
-mb_wm_manage_client (MBWindowManager       *wm,
-		     MBWindowManagerClient *client,
-		     Bool                   activate);
-
-void
-mb_wm_unmanage_client (MBWindowManager       *wm,
-		       MBWindowManagerClient *client,
-		       Bool                   destroy);
-
-void
 mb_wm_display_sync_queue (MBWindowManager* wm, MBWMSyncType sync);
 
 void
@@ -206,10 +193,10 @@
 void
 mb_wm_activate_client(MBWindowManager * wm, MBWindowManagerClient *c);
 
-void
+void __attribute__ ((visibility("hidden")))
 mb_wm_handle_ping_reply (MBWindowManager * wm, MBWindowManagerClient *c);
 
-void
+void __attribute__ ((visibility("hidden")))
 mb_wm_handle_hang_client (MBWindowManager * wm, MBWindowManagerClient *c);
 
 void
@@ -228,21 +215,15 @@
 mb_wm_cycle_apps (MBWindowManager *wm, Bool reverse);
 
 void
-mb_wm_set_theme (MBWindowManager *wm, MBWMTheme * theme);
-
-void
 mb_wm_set_theme_from_path (MBWindowManager *wm, const char *theme_path);
 
-void
-mb_wm_set_cursor (MBWindowManager * wm, MBWindowManagerCursor cursor);
-
-void
+void __attribute__ ((visibility("hidden")))
 mb_wm_compositing_on (MBWindowManager * wm);
 
-void
+void __attribute__ ((visibility("hidden")))
 mb_wm_compositing_off (MBWindowManager * wm);
 
-Bool
+Bool __attribute__ ((visibility("hidden")))
 mb_wm_compositing_enabled (MBWindowManager * wm);
 
 MBWMModality
@@ -251,10 +232,7 @@
 void
 mb_wm_sync (MBWindowManager *wm);
 
-void
-mb_wm_set_n_desktops (MBWindowManager *wm, int n_desktops);
-
-void
+void __attribute__ ((visibility("hidden")))
 mb_wm_select_desktop (MBWindowManager *wm, int desktop);
 
 void


