[gnome-pilot/dbus] Completely remove bonobo dependency.

[Halton Huo <haltonhuo src gnome org>]

commit 0a535d17469f155eb19cc93c8e0063658541427b
Author: Halton Huo <halton huo sun com>
Date:   Thu Mar 18 15:11:41 2010 +0800

    Completely remove bonobo dependency.
    
    Add myself in AUTHOURS, could I? :)

 AUTHORS                             |    1 +
 applet/pilot.c                      |    8 --------
 capplet/gpilotd-control-applet.c    |    9 ---------
 conduits/file/gpilot_install_file.c |    7 ++-----
 configure.ac                        |    6 ------
 gpilotd/manager.c                   |    2 +-
 utils/gpilotd-client.c              |    2 --
 utils/gpilotdcm-client.c            |    1 -
 8 files changed, 4 insertions(+), 32 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index c5e23df..013d70c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,7 @@ information.
 
 JP Rosevear  <jpr novell com>
 Matt Davey <mcdavey mrao cam ac uk>
+Halton Huo <haltonhuo gnome org>
 
 Previous authors:
 Manish Vachharajani <mvachhar vger rutgers edu>
diff --git a/applet/pilot.c b/applet/pilot.c
index 191466d..90bc71a 100644
--- a/applet/pilot.c
+++ b/applet/pilot.c
@@ -1042,14 +1042,6 @@ timeout (PilotApplet *self)
 			pilot_draw (self);
 			/* FIXME: add gpilot_monitor_state_change () */
 		} else {
-                        /* TODO conntcted monitor and notifications on
-			gnome_pilot_client_monitor_on_all_pilots (self->gpc);
-			
-			gnome_pilot_client_notify_on (self->gpc,GNOME_Pilot_NOTIFY_CONNECT);
-			gnome_pilot_client_notify_on (self->gpc,GNOME_Pilot_NOTIFY_CONDUIT);
-			gnome_pilot_client_notify_on (self->gpc,GNOME_Pilot_NOTIFY_DISCONNECT);
-                        */
-			
 			gtk_tooltips_set_tip (self->tooltips, 
 					      GTK_WIDGET (self->applet),
 					      _("Ready to synchronize"),
diff --git a/capplet/gpilotd-control-applet.c b/capplet/gpilotd-control-applet.c
index 50210d6..b9d4ab1 100644
--- a/capplet/gpilotd-control-applet.c
+++ b/capplet/gpilotd-control-applet.c
@@ -35,8 +35,6 @@
 #include "gnome-pilot-assistant.h"
 #include "gnome-pilot-capplet.h"
 
-#include <bonobo-activation/bonobo-activation.h>
-
 #include "pilot.h"
 #include "util.h"
 
@@ -48,15 +46,8 @@ monitor_pilots (GnomePilotClient *gpc, PilotState * state)
 		while (tmp!= NULL){
 			GPilotPilot *pilot =(GPilotPilot*)tmp->data;
 			g_message ("pilot = %s",pilot->name);
-                        /*TODO turn on notify with dbus 
-			gnome_pilot_client_monitor_on (gpc,pilot->name);
-                        */
 			tmp = tmp->next;
 		}
-                /*TODO turn on notify with dbus 
-		gnome_pilot_client_notify_on (gpc, GNOME_Pilot_NOTIFY_CONNECT);
-		gnome_pilot_client_notify_on (gpc, GNOME_Pilot_NOTIFY_DISCONNECT);
-                */
 	}
 }
 
diff --git a/conduits/file/gpilot_install_file.c b/conduits/file/gpilot_install_file.c
index 0361c91..67d9fb9 100644
--- a/conduits/file/gpilot_install_file.c
+++ b/conduits/file/gpilot_install_file.c
@@ -21,13 +21,10 @@
 
 #include "config.h"
 #include <gtk/gtk.h>
+#include <glib/gi18n-lib.h>
 #include <libgnome/gnome-init.h>
-#include <gpilotd/gnome-pilot-client.h>
-
-#include <bonobo.h>
-#include <bonobo-activation/bonobo-activation.h>
-
 
+#include <gpilotd/gnome-pilot-client.h>
 
 GnomePilotClient *gpc;
 GSList *handles;
diff --git a/configure.ac b/configure.ac
index 8004ab2..0052ff2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,9 +136,6 @@ dnl ******************************
 LIBXML_REQUIRED="libxml-2.0"
 LIBGNOME_REQUIRED="libgnome-2.0 >= 2.0.0"
 LIBGTK_REQUIRED="gtk+-2.0 >= 2.13.0"
-LIBBONOBO_REQUIRED="libbonobo-2.0 >= 2.0.0"
-LIBBONOBOUI_REQUIRED="libbonoboui-2.0 >= 2.0.0"
-BONOBO_ACTIVATION_REQUIRED="bonobo-activation-2.0 >= 1.0.3"
 DBUS_GLIB_REQUIRED="dbus-glib-1 >= 0.74"
 LIBPANELAPPLET_REQUIRED="libpanelapplet-2.0 >= 2.0.6"
 GCONF_REQUIRED="gconf-2.0"
@@ -148,10 +145,7 @@ PKG_CHECK_MODULES(GNOME_PILOT,
 	$LIBXML_REQUIRED
 	$LIBGNOME_REQUIRED
 	$LIBGTK_REQUIRED
-	$LIBBONOBO_REQUIRED
-	$LIBBONOBOUI_REQUIRED
 	$DBUS_GLIB_REQUIRED
-	$BONOBO_ACTIVATION_REQUIRED
 ])
 
 GNOME_PILOT_CFLAGS="$GNOME_PILOT_CFLAGS $PISOCK_CFLAGS"
diff --git a/gpilotd/manager.c b/gpilotd/manager.c
index e7aad15..60017c9 100644
--- a/gpilotd/manager.c
+++ b/gpilotd/manager.c
@@ -600,7 +600,7 @@ do_restore_foreach (GPilotRequest *req, GnomePilotInstallCarrier *carrier)
 
 	pilot_name = pilot_name_from_id (carrier->pu->userID, carrier->context);
 	/* FIXME: if carrier.conduit_list is NULL, the user hasn't
-	  enabled any file conduits. The corba restore call should
+	  enabled any file conduits. The dbus restore call should
 	  throw an exception or something.  */
 	iterator = carrier->conduit_list;
 	while ( iterator != NULL ) {
diff --git a/utils/gpilotd-client.c b/utils/gpilotd-client.c
index 3cadb78..0ee08c6 100644
--- a/utils/gpilotd-client.c
+++ b/utils/gpilotd-client.c
@@ -7,12 +7,10 @@
 
 #include <glib/gi18n.h>
 #include <libgnome/gnome-init.h>
-#include <bonobo-activation/bonobo-activation.h>
 
 #include <gpilotd/gnome-pilot-client.h>
 
 GnomePilotClient *gpc;
-CORBA_Environment ev;
 
 int     arg_pause=0,
 	arg_unpause=0,
diff --git a/utils/gpilotdcm-client.c b/utils/gpilotdcm-client.c
index 865326d..863f5a1 100644
--- a/utils/gpilotdcm-client.c
+++ b/utils/gpilotdcm-client.c
@@ -6,7 +6,6 @@
 #include <config.h>
 
 #include <glib/gi18n.h>
-#include <bonobo-activation/bonobo-activation.h>
 #include <libgnome/gnome-init.h>
 
 #include <libgpilotdCM/gnome-pilot-conduit-management.h>