diff options
| author | jvoisin | 2016-01-03 19:28:00 +0100 |
|---|---|---|
| committer | jvoisin | 2016-01-03 20:06:19 +0100 |
| commit | 75fa39309ac06ea0189fe37f84bbd44d0f27c00e (patch) | |
| tree | f673ecec0caaa7ee3a6aadca60fcb0ae7132cb20 /mat-gui | |
| parent | ac36b6c415f7e9868c54cc1622c242f9fea86673 (diff) | |
Fix the segfault when listing supported files
This should close https://labs.riseup.net/code/issues/10839
Diffstat (limited to '')
| -rwxr-xr-x | mat-gui | 18 |
1 files changed, 10 insertions, 8 deletions
| @@ -80,10 +80,11 @@ class GUI(object): | |||
| 80 | xml_parser.parse(xmlfile) | 80 | xml_parser.parse(xmlfile) |
| 81 | 81 | ||
| 82 | supported_cbox = self.builder.get_object('supported_cbox') | 82 | supported_cbox = self.builder.get_object('supported_cbox') |
| 83 | store = Gtk.ListStore(int, str) | 83 | store = Gtk.ListStore(GObject.TYPE_INT, GObject.TYPE_STRING) |
| 84 | for i, j in enumerate(self.supported_dict.list): | 84 | for i, j in enumerate(self.supported_dict.list): |
| 85 | store.append([i, j['name']]) | 85 | store.append([i, j['name']]) |
| 86 | supported_cbox.set_model(store) | 86 | supported_cbox.set_model(store) |
| 87 | supported_cbox.set_entry_text_column(1) | ||
| 87 | supported_cbox.set_active(0) | 88 | supported_cbox.set_active(0) |
| 88 | 89 | ||
| 89 | self.builder.get_object('supported_metadata').set_buffer(Gtk.TextBuffer()) | 90 | self.builder.get_object('supported_metadata').set_buffer(Gtk.TextBuffer()) |
| @@ -160,15 +161,15 @@ class GUI(object): | |||
| 160 | """ Popup that display on double-click | 161 | """ Popup that display on double-click |
| 161 | metadata from a file | 162 | metadata from a file |
| 162 | """ | 163 | """ |
| 163 | metadatapopupliststore = self.builder.get_object('MetadataPopupListStore') | 164 | metadataPopupListStore = self.builder.get_object('metadataPopupListStore') |
| 164 | metadatapopupliststore.clear() | 165 | metadataPopupListStore.clear() |
| 165 | if self.liststore[row][0].file.is_clean(): | 166 | if self.liststore[row][0].file.is_clean(): |
| 166 | self.liststore[row][2] = _('Clean') | 167 | self.liststore[row][2] = _('Clean') |
| 167 | metadatapopupliststore.append([_('No metadata found'), '']) | 168 | metadataPopupListStore.append([_('No metadata found'), '']) |
| 168 | else: | 169 | else: |
| 169 | self.liststore[row][2] = _('Dirty') | 170 | self.liststore[row][2] = _('Dirty') |
| 170 | for i, j in self.liststore[row][0].file.get_meta().iteritems(): | 171 | for i, j in self.liststore[row][0].file.get_meta().iteritems(): |
| 171 | metadatapopupliststore.append([i, j]) | 172 | metadataPopupListStore.append([i, j]) |
| 172 | 173 | ||
| 173 | popup_metadata = self.builder.get_object('MetadataPopup') | 174 | popup_metadata = self.builder.get_object('MetadataPopup') |
| 174 | title = self.liststore[row][0].file.basename | 175 | title = self.liststore[row][0].file.basename |
| @@ -190,6 +191,7 @@ class GUI(object): | |||
| 190 | w.set_website('https://mat.boum.org') | 191 | w.set_website('https://mat.boum.org') |
| 191 | w.set_website_label(_('Website')) | 192 | w.set_website_label(_('Website')) |
| 192 | w.set_position(Gtk.WindowPosition.CENTER) | 193 | w.set_position(Gtk.WindowPosition.CENTER) |
| 194 | w.set_transient_for(self.window) | ||
| 193 | w.run() | 195 | w.run() |
| 194 | w.destroy() | 196 | w.destroy() |
| 195 | 197 | ||
| @@ -345,10 +347,10 @@ non-anonymised) file to output archive')) | |||
| 345 | vbox.pack_start(treeview, True, True, 0) | 347 | vbox.pack_start(treeview, True, True, 0) |
| 346 | 348 | ||
| 347 | # Create columns | 349 | # Create columns |
| 348 | renderertext = Gtk.CellRendererText() | 350 | rendererText = Gtk.CellRendererText() |
| 349 | column = Gtk.TreeViewColumn(_('Filename'), renderertext, text=0) | 351 | column = Gtk.TreeViewColumn(_('Filename'), rendererText, text=0) |
| 350 | treeview.append_column(column) | 352 | treeview.append_column(column) |
| 351 | column = Gtk.TreeViewColumn(_('Reason'), renderertext, text=1) | 353 | column = Gtk.TreeViewColumn(_('Reason'), rendererText, text=1) |
| 352 | treeview.append_column(column) | 354 | treeview.append_column(column) |
| 353 | 355 | ||
| 354 | dialog.show_all() | 356 | dialog.show_all() |
