Merge lp:~indicator-applet-developers/indicator-applet/ubuntu into lp:~ubuntu-desktop/indicator-applet/ubuntu

[Ted Gould]

0.4.3

=== modified file 'configure'
--- configure	2010-06-04 16:17:45 +0000
+++ configure	2010-07-08 16:34:39 +0000
@@ -2844,7 +2844,7 @@
 
 # Define the identity of the package.
  PACKAGE=indicator-applet
- VERSION=0.4.2
+ VERSION=0.4.3
 
 
 cat >>confdefs.h <<_ACEOF
 
=== modified file 'configure.ac'
--- configure.ac	2010-06-04 16:17:45 +0000
+++ configure.ac	2010-07-08 16:34:39 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-applet, 0.4.2)
+AM_INIT_AUTOMAKE(indicator-applet, 0.4.3)
 
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-06-23 10:06:29 +0000
+++ debian/changelog	2010-07-08 16:34:39 +0000
@@ -1,3 +1,22 @@
+indicator-applet (0.4.3-0ubuntu1~ppa1) lucid; urgency=low
+
+  * New upstream release.
+    ∘ Fix sensitivity handling (LP: #598524)
+  * debian/source_indicator-applet.py, debian/indicator-applet-crashdb.conf,
+    debian/indicator-applet.install: Adding ability to report bugs
+    with non-Ubuntu packages.
+  * debian/source_indicator-applet.py: Typo in filename 
+  * debian/control: Removing indicator-renderer dependencies and
+    making them provides.
+  * debian/control: Removing dependency for indicator-applet-appmenu
+    and indicator-applet-complete on indicator-applet.
+
+  [Mitch Towner]
+  * debian/source_indicator-applet.py
+   - Add apport hook. (LP: #583174)
+
+ -- Ted Gould <[e-mail]>  Thu, 08 Jul 2010 11:29:37 -0500
+
 indicator-applet (0.4.2-0ubuntu3) UNRELEASED; urgency=low
 
   * debian/control: Add alternative dependencies to indicator-renderer, to
 
=== modified file 'debian/control'
--- debian/control	2010-06-23 10:06:29 +0000
+++ debian/control	2010-07-08 16:34:39 +0000
@@ -22,10 +22,11 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gnome-panel | indicator-renderer
+         gnome-panel
 Recommends: indicator-messages,
             indicator-sound,
             indicator-application
+Provides: indicator-renderer
 Description: GNOME panel indicator applet
  indicator-applet is an applet to display information from
  various applications consistently in the GNOME panel.
@@ -37,8 +38,8 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gnome-panel | indicator-renderer,
-         indicator-applet (= ${binary:Version}) | indicator-renderer
+         gnome-panel,
+         indicator-applet (= ${binary:Version})
 Recommends: indicator-session,
          indicator-me
 Conflicts: indicator-applet-sus, gdm (<< 2.27.90-0ubuntu1), fast-user-switch-applet
@@ -54,13 +55,13 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gnome-panel | indicator-renderer,
-         indicator-applet (= ${binary:Version}) | indicator-renderer
+         gnome-panel
 Recommends: indicator-session,
          indicator-me,
          indicator-messages,
          indicator-sound,
          indicator-application
+Provides: indicator-renderer
 Description: Clone of the GNOME panel indicator applet
  Indicator-applet is an applet to display information from
  various applications consistently in the GNOME panel.
@@ -72,9 +73,9 @@
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         gnome-panel | indicator-renderer,
-         indicator-applet (= ${binary:Version}) | indicator-renderer
+         gnome-panel
 Recommends: indicator-appmenu
+Provides: indicator-renderer
 Description: Clone of the GNOME panel indicator applet
  Indicator-applet is an applet to display information from
  various applications consistently in the GNOME panel.
 
=== added file 'debian/indicator-applet-crashdb.conf'
--- debian/indicator-applet-crashdb.conf	1970-01-01 00:00:00 +0000
+++ debian/indicator-applet-crashdb.conf	2010-07-08 16:34:39 +0000
@@ -0,0 +1,6 @@
+
+indicator_applet = {
+	'impl': 'launchpad',
+	'project': 'indicator-applet',
+	'bug_pattern_base': None,
+}
 
=== modified file 'debian/indicator-applet.install'
--- debian/indicator-applet.install	2009-08-18 19:15:12 +0000
+++ debian/indicator-applet.install	2010-07-08 16:34:39 +0000
@@ -1,3 +1,5 @@
 debian/tmp/usr/lib/bonobo/servers/GNOME_IndicatorApplet.server
 debian/tmp/usr/lib/indicator-applet/indicator-applet
 debian/tmp/usr/share/icons
+debian/source_indicator-applet.py usr/share/apport/package-hooks
+debian/indicator-applet-crashdb.conf /etc/apport/crashdb.conf.d/
 
=== added file 'debian/source_indicator-applet.py'
--- debian/source_indicator-applet.py	1970-01-01 00:00:00 +0000
+++ debian/source_indicator-applet.py	2010-07-08 16:34:39 +0000
@@ -0,0 +1,43 @@
+import os.path
+from apport.hookutils import *
+from xdg.BaseDirectory import xdg_cache_home
+
+APPLET_LOG = os.path.join(xdg_cache_home, 'indicator-applet.log')
+APPLET_SESSION_LOG = os.path.join(xdg_cache_home, 'indicator-applet-session.log')
+COMPLETE_LOG = os.path.join(xdg_cache_home, 'indicator-applet-complete.log')
+APPMENU_LOG = os.path.join(xdg_cache_home, 'indicator-applet-appmenu.log')
+
+def add_info(report, ui):
+    if not apport.packaging.is_distro_package(report['Package'].split()[0]):
+        report['ThirdParty'] = 'True'
+        report['CrashDB'] = 'indicator_applet'
+
+    response = ui.choice("How would you describe the issue?", ["None of the indicator applets are working correctly", "The sound applet is not working correctly", "The Social Networking Menu is not working correctly", "The login/logout applet is not working correctly", "The network applet is not working correctly", "The date/time applet in not working correctly", "The application testing applet in not working correctly", "The all-in-one (complete) applet is not working correctly", "Another applet is not working correctly"], False)
+    try:
+        if response == None: # user cancelled
+            raise StopIteration
+        if response[0] == 0: # an issue with indicator-applet
+            report.add_package_info("indicator-applet")
+        if response[0] == 1: # the issue is with indicator-sound
+            report.add_package_info("indicator-sound")
+        if response[0] == 2: # the issue is with indicator-me
+            report.add_package_info("indicator-me")
+        if response[0] == 3: # the issue is with indicator-session
+            report.add_package_info("indicator-session")
+        if response[0] == 4: # the issue is with indicator-network in UNE
+            report.add_package_info("indicator-network")
+        if response[0] == 5: # the issue is with indicator-datetime in "unity"
+            report.add_package_info("indicator-datetime")
+        if response[0] == 6: # the issue is with indicator-applet-appmenu
+            report.add_package_info("indicator-applet-appmenu")
+        if response[0] == 7: # the issue is with indicator-applet-complete
+            report.add_package_info("indicator-applet-complete")            
+        if response[0] == 8: # the issue is with indicator-application
+            report.add_package_info("indicator-application")
+    except:
+        print 'Unfortunately, that package is not installed. Please refer to https://wiki.ubuntu.com/Bugs/FindRightPackage'
+
+    attach_file_if_exists(report, APPLET_LOG, 'indicator-applet.log')
+    attach_file_if_exists(report, APPLET_SESSION_LOG, 'indicator-applet-session.log')
+    attach_file_if_exists(report, COMPLETE_LOG, 'indicator-applet-complete.log')
+    attach_file_if_exists(report, APPMENU_LOG, 'indicator-applet-appmenu.log')
 
=== modified file 'src/applet-main.c'
--- src/applet-main.c	2010-06-04 16:17:45 +0000
+++ src/applet-main.c	2010-07-08 16:34:39 +0000
@@ -206,10 +206,21 @@
 }
 
 static void
+sensitive_cb (GObject * obj, GParamSpec * pspec, gpointer user_data)
+{
+	g_return_if_fail(GTK_IS_WIDGET(obj));
+	g_return_if_fail(GTK_IS_WIDGET(user_data));
+
+	gtk_widget_set_sensitive(GTK_WIDGET(user_data), gtk_widget_get_sensitive(GTK_WIDGET(obj)));
+	return;
+}
+
+static void
 entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
 {
 	g_debug("Signal: Entry Added");
 	gboolean something_visible = FALSE;
+	gboolean something_sensitive = FALSE;
 
 	GtkWidget * menuitem = gtk_menu_item_new();
 	GtkWidget * box = (packdirection == GTK_PACK_DIRECTION_LTR) ?
@@ -224,8 +235,14 @@
 			something_visible = TRUE;
 		}
 
+		if (gtk_widget_get_sensitive(GTK_WIDGET(entry->image))) {
+			something_sensitive = TRUE;
+		}
+
 		g_signal_connect(G_OBJECT(entry->image), "show", G_CALLBACK(something_shown), menuitem);
 		g_signal_connect(G_OBJECT(entry->image), "hide", G_CALLBACK(something_hidden), menuitem);
+
+		g_signal_connect(G_OBJECT(entry->image), "notify::sensitive", G_CALLBACK(sensitive_cb), menuitem);
 	}
 	if (entry->label != NULL) {
 		switch(packdirection) {
@@ -241,12 +258,19 @@
 				break;
 		}		
 		gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(entry->label), FALSE, FALSE, 0);
+
 		if (gtk_widget_get_visible(GTK_WIDGET(entry->label))) {
 			something_visible = TRUE;
 		}
 
+		if (gtk_widget_get_sensitive(GTK_WIDGET(entry->label))) {
+			something_sensitive = TRUE;
+		}
+
 		g_signal_connect(G_OBJECT(entry->label), "show", G_CALLBACK(something_shown), menuitem);
 		g_signal_connect(G_OBJECT(entry->label), "hide", G_CALLBACK(something_hidden), menuitem);
+
+		g_signal_connect(G_OBJECT(entry->label), "notify::sensitive", G_CALLBACK(sensitive_cb), menuitem);
 	}
 	gtk_container_add(GTK_CONTAINER(menuitem), box);
 	gtk_widget_show(box);
@@ -268,6 +292,7 @@
 	if (something_visible) {
 		gtk_widget_show(menuitem);
 	}
+	gtk_widget_set_sensitive(menuitem, something_sensitive);
 
 	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_ENTRY,  entry);
 	g_object_set_data(G_OBJECT(menuitem), MENU_DATA_INDICATOR_OBJECT, io);
@@ -288,10 +313,12 @@
 	if (entry->label != NULL) {
 		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(something_shown), widget);
 		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(something_hidden), widget);
+		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->label), G_CALLBACK(sensitive_cb), widget);
 	}
 	if (entry->image != NULL) {
 		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(something_shown), widget);
 		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(something_hidden), widget);
+		g_signal_handlers_disconnect_by_func(G_OBJECT(entry->image), G_CALLBACK(sensitive_cb), widget);
 	}
 
 	gtk_widget_destroy(widget);