Entertainer Media Center

Merge lp://staging/~samuel-buffet/entertainer/bug_363035 into lp://staging/entertainer

  1. bug_363035
  2. Merge into trunk
Proposed by Samuel Buffet
Status: Merged
Approved by: Paul Hummer
Approved revision: 360
Merged at revision: not available
Proposed branch: lp://staging/~samuel-buffet/entertainer/bug_363035
Merge into: lp://staging/entertainer
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~samuel-buffet/entertainer/bug_363035
Reviewer Review Type Date Requested Status
Paul Hummer Approve
Review via email: mp+5667@code.staging.launchpad.net

Commit message

GTKIter bug in the content-manager is fixed. Fix for bug 363035 (Samuel Buffet)

To post a comment you must log in.
Revision history for this message
Samuel Buffet (samuel-buffet) wrote :

Hi,

A fix for bug Bug #363035 (extended to other Tabs of the content-manager).

In the content manager we had a bunch of methods using a gtktree selection.

But there were no tests to check if something was really selected.

Samuel-

lp://staging/~samuel-buffet/entertainer/bug_363035 updated
360. By Samuel Buffet

merged vs 363

Revision history for this message
Paul Hummer (rockstar) wrote :

This is pretty straightforward.

Revision history for this message
Paul Hummer (rockstar) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'entertainerlib/utils/content_management_dialog.py'
2--- entertainerlib/utils/content_management_dialog.py 2009-02-26 22:58:43 +0000
3+++ entertainerlib/utils/content_management_dialog.py 2009-04-17 19:24:56 +0000
4@@ -198,6 +198,8 @@
5 widget = self.widgets.get_widget("treeview_videos")
6 model = widget.get_model()
7 selection = widget.get_selection().get_selected()
8+ if selection[1] == None:
9+ return
10 rm_folder = model.get_value(selection[1], 0)
11 self.video_folders.remove(rm_folder)
12 str_folders = ";".join(self.video_folders)
13@@ -211,6 +213,8 @@
14 url_entry = self.widgets.get_widget("url_entry")
15 model = widget.get_model()
16 selection = widget.get_selection().get_selected()
17+ if selection[1] == None:
18+ return
19 folder = model.get_value(selection[1], 0)
20 url_entry.set_text(folder)
21 url_dialog.set_title(_("Edit URL"))
22@@ -259,6 +263,8 @@
23 widget = self.widgets.get_widget("treeview_music")
24 model = widget.get_model()
25 selection = widget.get_selection().get_selected()
26+ if selection[1] == None:
27+ return
28 rm_folder = model.get_value(selection[1], 0)
29 self.music_folders.remove(rm_folder)
30 str_folders = ";".join(self.music_folders)
31@@ -272,6 +278,8 @@
32 url_entry = self.widgets.get_widget("url_entry")
33 model = widget.get_model()
34 selection = widget.get_selection().get_selected()
35+ if selection[1] == None:
36+ return
37 folder = model.get_value(selection[1], 0)
38 url_entry.set_text(folder)
39 url_dialog.set_title(_("Edit URL"))
40@@ -308,6 +316,8 @@
41 widget = self.widgets.get_widget("treeview_images")
42 model = widget.get_model()
43 selection = widget.get_selection().get_selected()
44+ if selection[1] == None:
45+ return
46 rm_folder = model.get_value(selection[1], 0)
47 self.image_folders.remove(rm_folder)
48 str_folders = ";".join(self.image_folders)
49@@ -321,6 +331,8 @@
50 url_entry = self.widgets.get_widget("url_entry")
51 model = widget.get_model()
52 selection = widget.get_selection().get_selected()
53+ if selection[1] == None:
54+ return
55 folder = model.get_value(selection[1], 0)
56 url_entry.set_text(folder)
57 url_dialog.set_title(_("Edit URL"))
58@@ -356,6 +368,8 @@
59 widget = self.widgets.get_widget("treeview_feeds")
60 model = widget.get_model()
61 selection = widget.get_selection().get_selected()
62+ if selection[1] == None:
63+ return
64 rm_folder = model.get_value(selection[1], 0)
65 self.feeds.remove(rm_folder)
66 str_folders = ";".join(self.feeds)
67@@ -369,6 +383,8 @@
68 url_entry = self.widgets.get_widget("url_entry")
69 model = widget.get_model()
70 selection = widget.get_selection().get_selected()
71+ if selection[1] == None:
72+ return
73 feed = model.get_value(selection[1], 0)
74 url_entry.set_text(feed)
75 url_dialog.set_title(_("Edit feed"))
76@@ -519,6 +535,8 @@
77 result_list = self.widgets.get_widget("location_results_treeview")
78 model = result_list.get_model()
79 selection = result_list.get_selection().get_selected()
80+ if selection[1] == None:
81+ return
82 location_string = model.get_value(selection[1], 0)
83
84 location_list = self.widgets.get_widget("treeview_locations")

Subscribers

People subscribed via source and target branches