Ubuntu
jockey package

Merge lp:~bilalakhtar/ubuntu/maverick/jockey/fix-600804 into lp:ubuntu/maverick/jockey

  1. Maverick (10.10)
  2. fix-600804
  3. Merge into maverick
Proposed by Bilal Akhtar
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~bilalakhtar/ubuntu/maverick/jockey/fix-600804
Merge into: lp:ubuntu/maverick/jockey
Diff against target: 35 lines (+10/-0)
2 files modified
debian/changelog (+8/-0)
gtk/jockey-gtk (+2/-0)
To merge this branch: bzr merge lp:~bilalakhtar/ubuntu/maverick/jockey/fix-600804
Reviewer Review Type Date Requested Status
Martin Pitt Pending
Ubuntu Sponsors Pending
Review via email: mp+33402@code.launchpad.net

Description of the change

This branch fixes bug #600804 .

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks for the patch. I won't merge the branch directly, though, but instead make the change in trunk. Also, kde needs the corresponding change as well, but I'll handle that.

Will follow up in the bug report.

Unmerged revisions

88. By Bilal Akhtar

* gtk/jockey-gtk:
  - Remove button now becomes invisible whenever a restart is required after adding
    a driver. (LP: #600804)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-08-12 16:06:53 +0000
3+++ debian/changelog 2010-08-23 15:17:44 +0000
4@@ -1,3 +1,11 @@
5+jockey (0.5.9-0ubuntu3) maverick; urgency=low
6+
7+ * gtk/jockey-gtk:
8+ - Remove button now becomes invisible whenever a restart is required after adding
9+ a driver. (LP: #600804)
10+
11+ -- Bilal Akhtar <bilalakhtar@ubuntu.com> Mon, 23 Aug 2010 17:59:01 +0300
12+
13 jockey (0.5.9-0ubuntu2) maverick; urgency=low
14
15 * data/handlers/fglrx.py, nvidia.py:
16
17=== modified file 'gtk/jockey-gtk'
18--- gtk/jockey-gtk 2010-07-23 15:13:49 +0000
19+++ gtk/jockey-gtk 2010-08-23 15:17:44 +0000
20@@ -311,6 +311,7 @@
21 self.w('label_drivername').set_label('<b>%s</b>' % info['name'])
22 self.current_driver_name = info['name']
23 self.w('textview_description').get_buffer().set_text(info['description'])
24+ self.w('button_toggle').show()
25 if info['certified'] == None:
26 self.w('image_certification').hide()
27 elif info['certified']:
28@@ -344,6 +345,7 @@
29 elif info['needs_reboot']:
30 self.w('image_enabled').show()
31 self.w('image_enabled').set_from_stock(gtk.STOCK_REFRESH, gtk.ICON_SIZE_BUTTON)
32+ self.w('button_toggle').hide()
33 elif info['enabled']:
34 self.w('image_enabled').show()
35 self.w('image_enabled').set_from_icon_name('jockey-enabled', gtk.ICON_SIZE_BUTTON)

Subscribers

People subscribed via source and target branches

to all changes: