Merge lp:~manishsinha/gnome-activity-journal/fixes-831436-gaj-notloading-oneiric into lp:ubuntu/oneiric/gnome-activity-journal

[Manish Sinha (मनीष सिन्हा)]

Add patch to disable setting the background which was blocking AJ

As you can see from the patch that it disables setting the background. This was the reason of a problem. If this is not disabled, the whole application is useless to use.

This Ask Ubuntu question 9http://askubuntu.com/questions/64021/gnome-activity-journal-stalls/64105) OP has a snapshot of how it looks http://i.stack.imgur.com/sZlC8.png without this patch
and after fixing it looks like this (on my computer)
https://bugs.launchpad.net/ubuntu/+source/gnome-activity-journal/+bug/831436/+attachment/2502493/+files/sct.png

[lp:~manishsinha/gnome-activity-journal/fixes-831436-gaj-notloading-oneiric]

9. By Manish Sinha (मनीष सिन्हा) on 2011-10-03

Add patch to disable setting the background which was blocking AJ (LP: #831436)

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-16 19:12:03 +0000
+++ debian/changelog	2011-10-03 20:54:26 +0000
@@ -1,3 +1,9 @@
+gnome-activity-journal (0.8.0-1ubuntu1) oneiric; urgency=low
+
+  * Add patch to disable setting the background which was blocking AJ (LP: #831436)
+
+ -- Manish Sinha <[e-mail]>  Tue, 04 Oct 2011 01:24:57 +0530
+
 gnome-activity-journal (0.8.0-1) unstable; urgency=low
 
   [ Siegfried-Angel Gevatter Pujals ]

=== added directory 'debian/patches'
=== added file 'debian/patches/disable_set_background.patch'
--- debian/patches/disable_set_background.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable_set_background.patch	2011-10-03 20:54:26 +0000
@@ -0,0 +1,13 @@
+=== modified file 'gnome-activity-journal/src/histogram.py'
+--- gnome-activity-journal/src/histogram.py	2011-03-16 16:36:25 +0000
++++ gnome-activity-journal/src/histogram.py	2011-10-03 18:10:10 +0000
+@@ -157,7 +157,7 @@
+         """
+         The major drawing method that the expose event calls directly
+         """
+-        widget.style.set_background(widget.window, gtk.STATE_NORMAL)
++        #widget.style.set_background(widget.window, gtk.STATE_NORMAL)
+         context = widget.window.cairo_create()
+         self.expose(widget, event, context)
+ 
+

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2011-10-03 20:54:26 +0000
@@ -0,0 +1,1 @@
+disable_set_background.patch