Merge lp:~bilalakhtar/jockey/fix-616569 into lp:~ubuntu-core-dev/jockey/ubuntu

[Bilal Akhtar]

This branch fixes bug #616569 .

[lp:~bilalakhtar/jockey/fix-616569]

422. By Bilal Akhtar on 2010-08-12

Re-wrote title

[Martin Pitt (pitti)]

I made that change in trunk:

  http://bazaar.launchpad.net/~jockey-hackers/jockey/trunk/revision/635

I won't merge this branch, since we don't use patches on the Ubuntu branch. It'll just trickle down with the next upstream merge.

Thank you!

review: Approve

Unmerged revisions

422. By Bilal Akhtar on 2010-08-12

Re-wrote title

421. By Bilal Akhtar on 2010-08-12

* debian/patches/01_progress_dialog_add_title.patch:
  - Add a title to the 'Searching for available drivers' progress
    window. (LP: #616569)

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-23 13:13:53 +0000
+++ debian/changelog	2010-08-12 05:16:43 +0000
@@ -1,3 +1,11 @@
+jockey (0.5.9-0ubuntu2) maverick; urgency=low
+
+  * debian/patches/01_progress_dialog_add_title.patch:
+    - Add a title to the 'Searching for available drivers' progress
+      window. (LP: #616569)
+
+ -- Bilal Akhtar <[e-mail]>  Thu, 12 Aug 2010 10:27:56 +0530
+
 jockey (0.5.9-0ubuntu1) maverick; urgency=low
 
   * New upstream release. Changes since our last snapshot:

=== added file 'debian/patches/01_progress_dialog_add_title.patch'
--- debian/patches/01_progress_dialog_add_title.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01_progress_dialog_add_title.patch	2010-08-12 05:16:43 +0000
@@ -0,0 +1,20 @@
+Description: Patch to add a title to the progress window
+ This patch adds a title to the window that shows a progress
+ bar while jockey searches for available drivers. Earlier, the
+ window was left untitled.
+
+Author: Bilal Akhtar <[e-mail]>
+Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/jockey/+bug/616569
+Forwarded: https://bugs.edge.launchpad.net/jockey/+bug/616569
+
+diff -Nur -x '*.orig' -x '*~' jockey/gtk/jockey-gtk.ui jockey.new/gtk/jockey-gtk.ui
+--- jockey/gtk/jockey-gtk.ui	2010-08-12 10:16:26.000000000 +0530
++++ jockey.new/gtk/jockey-gtk.ui	2010-08-12 10:21:12.723781247 +0530
+@@ -361,6 +361,7 @@
+   </object>
+   <object class="GtkWindow" id="window_progress">
+     <property name="border_width">12</property>
++    <property name="title" translatable="yes">Hardware Drivers</property>
+     <property name="resizable">False</property>
+     <property name="modal">True</property>
+     <property name="window_position">center-always</property>