* Upstream Merge

  * Fix signals with NULL entries in the loader
  * Adding a comment for setting up debugging options
  * Adding annotations for GIR files

6 files changed, 25 insertions, 7 deletions

diff --git a/configure.ac b/configure.ac
index 1188b04..bc11ce3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ GIO_UNIX_REQUIRED_VERSION=2.22
 
 AC_ARG_WITH([gtk],
   [AS_HELP_STRING([--with-gtk],
-    [Which version of gtk to use @<:@default=2@:>@])],
+    [Which version of gtk to use @<:@default=3@:>@])],
   [],
   [with_gtk=3])
 AS_IF([test "x$with_gtk" = x3],
diff --git a/debian/changelog b/debian/changelog
index 5980954..a57f12b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libindicator (0.3.90-0ubuntu2~ppa1) UNRELEASED; urgency=low
+
+  * Upstream Merge
+    * Fix signals with NULL entries in the loader
+    * Adding a comment for setting up debugging options
+    * Adding annotations for GIR files
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 12 Jul 2011 10:53:54 -0500
+
 libindicator (0.3.90-0ubuntu1) oneiric; urgency=low
 
   [ Ted Gould ]
diff --git a/libindicator/Makefile.am b/libindicator/Makefile.am
index 4433655..f9fb011 100644
--- a/libindicator/Makefile.am
+++ b/libindicator/Makefile.am
@@ -22,7 +22,7 @@ INDICATOR_API_VERSION = 4
 		-e "s|\@indicator_abi_version\@|$(INDICATOR_ABI_VERSION)|" \
 		$< > $@
 
-CLEANFILES = indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
+CLEANFILES += indicator$(VER)-0.$(INDICATOR_API_VERSION).pc
 
 include $(top_srcdir)/Makefile.am.marshal
 
diff --git a/libindicator/indicator-object.c b/libindicator/indicator-object.c
index 2fe8dd1..a563ebe 100644
--- a/libindicator/indicator-object.c
+++ b/libindicator/indicator-object.c
@@ -447,15 +447,15 @@ get_entries_default (IndicatorObject * io)
 }
 
 /**
-	indicator_object_get_entires:
+	indicator_object_get_entries:
 	@io: #IndicatorObject to query
 
 	This function looks on the class for the object and calls
 	it's #IndicatorObjectClass::get_entries function.  The
 	list should be owned by the caller, but the individual
-	enteries should not be.
+	entries should not be.
 
-	Return value: A list if #IndicatorObjectEntry structures or
+	Return value: (element-type IndicatorObjectEntry) (transfer container): A list if #IndicatorObjectEntry structures or
 		NULL if there is an error.
 */
 GList *
diff --git a/tools/80indicator-debugging b/tools/80indicator-debugging
index f21559c..85d0a35 100644
--- a/tools/80indicator-debugging
+++ b/tools/80indicator-debugging
@@ -4,6 +4,9 @@
 # make debugging difficult and are not recommended for
 # daily use.  Development use only!
 
+# To use: either copy or symbolicly link this file to the
+# Xsession dictory.  Specifically: /etc/X11/Xsession.d
+
 # Timeout after 1 minute
 export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=60000
 
diff --git a/tools/indicator-loader.c b/tools/indicator-loader.c
index 027d364..06dd4b4 100644
--- a/tools/indicator-loader.c
+++ b/tools/indicator-loader.c
@@ -32,7 +32,9 @@ activate_entry (GtkWidget * widget, gpointer user_data)
 {
 	g_return_if_fail(INDICATOR_IS_OBJECT(user_data));
 	gpointer entry = g_object_get_data(G_OBJECT(widget), ENTRY_DATA_NAME);
-	g_return_if_fail(entry == NULL);
+	if (entry == NULL) {
+		g_debug("Activation on: (null)");
+	}
 
 	indicator_object_entry_activate(INDICATOR_OBJECT(user_data), (IndicatorObjectEntry *)entry, gtk_get_current_event_time());
 	return;
@@ -99,7 +101,11 @@ entry_removed (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user
 static void
 menu_show (IndicatorObject * io, IndicatorObjectEntry * entry, guint timestamp, gpointer user_data)
 {
-	g_debug("Show Menu: %s", entry->label != NULL ? gtk_label_get_text(entry->label) : "No Label");
+	if (entry != NULL) {
+		g_debug("Show Menu: %s", entry->label != NULL ? gtk_label_get_text(entry->label) : "No Label");
+	} else {
+		g_debug("Show Menu: (null)");
+	}
 	return;
 }