diff options
author | Julien Valroff <julien@kirya.net> | 2011-04-08 07:12:49 +0200 |
---|---|---|
committer | Julien Valroff <julien@kirya.net> | 2011-04-08 07:12:49 +0200 |
commit | 208045d55b421bb11b3dbfea69a59c8a5e75111f (patch) | |
tree | 5eb24282f8add12d5affc41d37b4bcdb61a7a7f2 /rapid | |
parent | 478f6858602c736b67d420cbf198aeab3313cc23 (diff) | |
parent | 5168fdb07d6dc2b77f0ef9c7502940ce4a02e9aa (diff) |
Merge commit 'upstream/0.3.6'
Diffstat (limited to 'rapid')
-rw-r--r-- | rapid/ChangeLog | 12 | ||||
-rw-r--r-- | rapid/config.py | 2 | ||||
-rw-r--r-- | rapid/renamesubfolderprefs.py | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/rapid/ChangeLog b/rapid/ChangeLog index a1b7070..292d4b8 100644 --- a/rapid/ChangeLog +++ b/rapid/ChangeLog @@ -1,3 +1,15 @@ +Version 0.3.6 +------------- + +2011-04-05 + +This release contains a minor fix to allow program preferences to be changed +on upcoming Linux distributions like Ubuntu 11.04 and Fedora 15. + +It also contains a minor packaging change so it can be installed in Ubuntu +11.04. + + Version 0.3.5 ------------- diff --git a/rapid/config.py b/rapid/config.py index 626ae33..e798057 100644 --- a/rapid/config.py +++ b/rapid/config.py @@ -15,7 +15,7 @@ ### along with this program; if not, write to the Free Software ### Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -version = '0.3.5' +version = '0.3.6' GCONF_KEY="/apps/rapid-photo-downloader" GLADE_FILE = "glade3/rapid.glade" diff --git a/rapid/renamesubfolderprefs.py b/rapid/renamesubfolderprefs.py index d46a8c1..d538030 100644 --- a/rapid/renamesubfolderprefs.py +++ b/rapid/renamesubfolderprefs.py @@ -837,6 +837,8 @@ class Comboi18n(gtk.ComboBox): cell = gtk.CellRendererText() self.pack_start(cell, True) self.add_attribute(cell, 'text', 1) + # must name the combo box on pygtk used in Ubuntu 11.04, Fedora 15, etc. + self.set_name('GtkComboBox') def append_text(self, text): model = self.get_model() |