[gnome-shell] BluetoothStatus: depend more on libgnome-bluetooth-applet



commit c1ba920c86edb1f1530d031d53985e5b84c294cb
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Mon Jan 24 18:39:45 2011 +0100

    BluetoothStatus: depend more on libgnome-bluetooth-applet
    
    Ensure that a dependency is generated even when using --as-needed,
    by adding a fake function that calls into the library.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=639324
    
    Was accidentally removed, as part of the switch to building
    a gnome-shell binary, reapplying the original patch. - Owen
    
    https://bugzilla.gnome.org/show_bug.cgi?id=645596

 src/gnome-shell-plugin.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index b922ca3..1b2ccf6 100644
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -366,3 +366,17 @@ MetaPluginInfo *gnome_shell_plugin_plugin_info (MetaPlugin *plugin)
 
   return &info;
 }
+
+#if HAVE_BLUETOOTH
+/* HACK:
+   Add a non-static function that calls into libgnome-bluetooth-applet.so,
+   to avoid the linker being too smart and removing the dependency.
+   This function is never actually called.
+*/
+extern GType bluetooth_applet_get_type(void);
+void _shell_link_to_bluetooth(void);
+
+void _shell_link_to_bluetooth(void) {
+  bluetooth_applet_get_type();
+}
+#endif



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