Make possible to remove nothere applet from planel and activate it by defaut if dep are met. Fixes bug #489978 (Frederic Peters).

svn path=/trunk/; revision=934

2 files changed, 15 insertions, 1 deletions

diff --git a/configure.ac b/configure.ac
index c6e1aefdc..ec78ded33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,7 +192,7 @@ AM_CONDITIONAL(HAVE_MEGAPHONE, test "x$have_megaphone" = "xyes")
 AC_ARG_ENABLE(nothere,
               AS_HELP_STRING([--enable-nothere=@<:@no/yes/auto@:>@],
                              [build nothere applet]), ,
-                             enable_nothere=no)
+                             enable_nothere=auto)
 
 if test "x$enable_nothere" != "xno"; then
    PKG_CHECK_MODULES(NOTHERE, 
diff --git a/nothere/src/nothere-applet.c b/nothere/src/nothere-applet.c
index 5d225698b..b0a8b6e55 100644
--- a/nothere/src/nothere-applet.c
+++ b/nothere/src/nothere-applet.c
@@ -55,10 +55,24 @@ nothere_applet_class_init (NotHereAppletClass *class)
 	GTK_OBJECT_CLASS (class)->destroy = nothere_applet_destroy;
 }
 
+static gboolean
+do_not_eat_button_press (GtkWidget      *widget,
+                         GdkEventButton *event)
+{
+        if (event->button != 1) {
+                g_signal_stop_emission_by_name (widget, "button_press_event");
+        }
+
+        return FALSE;
+}
+
 static void
 nothere_applet_init (NotHereApplet *applet)
 {
 	applet->presence_chooser = empathy_presence_chooser_new ();
+	g_signal_connect (G_OBJECT (applet->presence_chooser), "button_press_event",
+                          G_CALLBACK (do_not_eat_button_press), NULL);
+
 	gtk_widget_show (applet->presence_chooser);
 
 	gtk_container_add (GTK_CONTAINER (applet), applet->presence_chooser);