Author: matz
Date: Thu Mar 20 01:47:42 2008
New Revision: 9216
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9216&view=rev
Log:
Funny, an unused function was the only one who possibly could lead to a
call to that glib function, which in turn is the only call that requires
linking in libglib.
Modified:
trunk/libzypp/zypp/target/hal/HalContext.cc
trunk/libzypp/zypp/target/hal/HalContext.h
Modified: trunk/libzypp/zypp/target/hal/HalContext.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/hal/HalContext.cc?rev=9216&r1=9215&r2=9216&view=diff
==============================================================================
--- trunk/libzypp/zypp/target/hal/HalContext.cc (original)
+++ trunk/libzypp/zypp/target/hal/HalContext.cc Thu Mar 20 01:47:42 2008
@@ -137,7 +137,7 @@
class HalContext_Impl
{
public:
- HalContext_Impl(bool monitorable = false);
+ HalContext_Impl();
~HalContext_Impl();
DBusConnection *conn;
@@ -192,7 +192,7 @@
////////////////////////////////////////////////////////////////
- HalContext_Impl::HalContext_Impl(bool monitorable)
+ HalContext_Impl::HalContext_Impl()
: conn(NULL)
, hctx(NULL)
, pcon(false) // we allways use shared connections at the moment
@@ -209,9 +209,6 @@
));
}
- if( monitorable)
- dbus_connection_setup_with_g_main(conn, NULL);
-
hctx = libhal_ctx_new();
if( !hctx)
{
@@ -294,16 +291,6 @@
}
// -------------------------------------------------------------
- HalContext::HalContext(bool autoconnect, bool monitorable)
- : h_impl( NULL)
- {
- MutexLock lock(g_Mutex);
-
- if( autoconnect)
- h_impl.reset( new HalContext_Impl(monitorable));
- }
-
- // -------------------------------------------------------------
HalContext::~HalContext()
{
MutexLock lock(g_Mutex);
Modified: trunk/libzypp/zypp/target/hal/HalContext.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/hal/HalContext.h?rev=9216&r1=9215&r2=9216&view=diff
==============================================================================
--- trunk/libzypp/zypp/target/hal/HalContext.h (original)
+++ trunk/libzypp/zypp/target/hal/HalContext.h Thu Mar 20 01:47:42 2008
@@ -161,8 +161,6 @@
const std::string &key);
private:
- //friend HalMonitor;
- HalContext(bool,bool);
zypp::RW_pointer