[libpanelappletmm] Remove the libgnomeui dependency. (Closes #580812)
- From: Hubert Figuière <hub src gnome org>
- To: svn-commits-list gnome org
- Subject: [libpanelappletmm] Remove the libgnomeui dependency. (Closes #580812)
- Date: Sat, 16 May 2009 15:44:39 -0400 (EDT)
commit 81cbf26b018d1a3cf1f6a274831f25c7ba668151
Author: Hubert Figuiere <hub figuiere net>
Date: Mon Apr 27 17:31:03 2009 -0400
Remove the libgnomeui dependency. (Closes #580812)
---
ChangeLog | 5 +++++
configure.in | 4 ++--
libpanelapplet/libpanelappletmm/init.cc | 5 ++---
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 62e9840..42036cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-01 Hubert Figuiere <hub figuiere net>
+
+ * libpanelapplet/libpanelappletmm/init.cc (Gnome):
+ Remove the libgnomeui dependency. (Closes #580812)
+
2009-01-24 Deng Xiyue <manphiz gmail com>
* Change license header to mention Lesser General Public License
diff --git a/configure.in b/configure.in
index 7c5b2b0..59f283b 100644
--- a/configure.in
+++ b/configure.in
@@ -91,9 +91,9 @@ LIBGNOMEMM_VERSION_NEEDED=2.6.0
AC_SUBST(LIBGNOMEMM_VERSION_NEEDED)
LIBPANELAPPLET_VERSION_NEEDED=2.14.0
AC_SUBST(LIBPANELAPPLET_VERSION_NEEDED)
-LIBGNOMEUI_VERSION_NEEDED=2.24.0
-PKG_CHECK_MODULES(LIBPANELAPPLETMM, gtkmm-2.4 >= $GTKMM_VERSION_NEEDED gconfmm-2.6 >= $GCONFMM_VERSION_NEEDED libgnomemm-2.6 >= $LIBGNOMEMM_VERSION_NEEDED libpanelapplet-2.0 >= $LIBPANELAPPLET_VERSION_NEEDED libgnomeui-2.0 >= $LIBGNOMEUI_VERSION_NEEDED)
+
+PKG_CHECK_MODULES(LIBPANELAPPLETMM, gtkmm-2.4 >= $GTKMM_VERSION_NEEDED gconfmm-2.6 >= $GCONFMM_VERSION_NEEDED libgnomemm-2.6 >= $LIBGNOMEMM_VERSION_NEEDED libpanelapplet-2.0 >= $LIBPANELAPPLET_VERSION_NEEDED)
AC_SUBST(LIBPANELAPPLETMM_CFLAGS)
AC_SUBST(LIBPANELAPPLETMM_LIBS)
diff --git a/libpanelapplet/libpanelappletmm/init.cc b/libpanelapplet/libpanelappletmm/init.cc
index af3e19d..53eda47 100644
--- a/libpanelapplet/libpanelappletmm/init.cc
+++ b/libpanelapplet/libpanelappletmm/init.cc
@@ -25,8 +25,7 @@
#include <gtkmm/main.h>
#include <libpanelappletmmconfig.h> //For LIBPANELAPPLETMM_VERSION
-#include <libgnome/gnome-program.h>
-#include <gnome.h>
+#include <bonobo/bonobo-main.h>
namespace Gnome
{
@@ -38,7 +37,7 @@ void init(const Glib::ustring& app_id, const Glib::ustring& app_version, int arg
{
Gtk::Main::init_gtkmm_internals(); //Sets up the g type system and the Glib::wrap() table.
wrap_init(); //Tells the Glib::wrap() table about the libpanelappletmm classes.
- gnome_program_init(app_id.c_str(), app_version.c_str(), LIBGNOMEUI_MODULE, argc, argv, GNOME_CLIENT_PARAM_SM_CONNECT, FALSE, GNOME_PARAM_NONE);
+ bonobo_init(&argc, argv);
}
} //namespace Panel
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]