← Back to branch summary

~ubuntu-branches/ubuntu/lucid/transmission/lucid

« back to all changes in this revision

Viewing changes to gtk/relocate.c

  • Committer: Bazaar Package Importer
  • Author(s): Krzysztof Klimonda, Krzysztof Klimonda, Chris Coulson
  • Date: 2010-03-03 02:55:26 UTC
  • mfrom: (1.1.34 upstream) (2.1.17 sid)
  • Revision ID: james.westby@ubuntu.com-20100303025526-qcjmpnlvk9jv3y5o
Tags: 1.92-0ubuntu1
https://launchpad.net/bugs/538034
https://launchpad.net/bugs/518692
https://launchpad.net/bugs/529037
https://launchpad.net/bugs/527299
https://launchpad.net/bugs/505861
https://launchpad.net/bugs/542194
[ Krzysztof Klimonda ]
* New upstream release (LP: #538034), rebased on debian testing.
  Remaining changes:
  - debian/control:
    + Added replaces & provides clutch (now included as part of transmission).
      Can be removed in lucid+1
    + Added liblaunchpad-integration-dev and lsb-release to Build-Depends
  - debian/rules:
    + create a po template during package build.
  - debian/patches/01_lpi.patch:
    + integrate transmission with launchpad
  - debian/patches/20_add_x-ubuntu-gettext-domain.diff:
    + add x-ubuntu-gettext-domain to .desktop file.
  - debian/transmission-daemon.default:
    - remove --auth from OPTIONS
  - debian/control, debian/rules:
    + build transmission gtk+ client with both gconf and libcanberra support.
  - debian/patches/dont_build_libevent.patch:
    + disable libevent in configure.ac and Makefile.am because we use autotools
      to regenerate build files.
  - lucid/debian/patches/updateminiupnpcstrings_double_escape_slash.patch:
    + Deleted as the bug is fixed upstream
* Fixes bugs:
  - Fix directory selection error in GTK+ 2.19 (LP: #518692)
  - Transmission "Set Location" - dialog doesn't disappear (LP: #529037)
  - The "Torrent Options" dialog's Torrent Priority row gets too much
    vertical stretch (LP: #527299)
  - "Open Folder" behavior can be confusing for single-file torrents
    (LP: #505861)
* Refreshed 99_autoreconf.patch

[ Chris Coulson ]
* debian/patches/disable_web_ui.patch:
  - Disable the web UI by default again (LP: #542194)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gtk/relocate.c
52
52
    }
53
53
    else if( done != TR_LOC_MOVING )
54
54
    {
55
 
        gtk_widget_destroy( GTK_WIDGET( data->moving_dialog ) );
 
55
        gtk_widget_destroy( GTK_WIDGET( data->dialog ) );
56
56
        g_free( data );
57
57
    }
58
58
 
134
134
    if( previousLocation == NULL )
135
135
        previousLocation = g_strdup( pref_string_get( TR_PREFS_KEY_DOWNLOAD_DIR ) );
136
136
    w = gtk_file_chooser_button_new( _( "Set Torrent Location" ), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER );
137
 
    gtk_file_chooser_set_filename( GTK_FILE_CHOOSER( w ), previousLocation );
 
137
    gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER( w ), previousLocation );
138
138
    g_object_set_data( G_OBJECT( d ), "chooser", w );
139
139
    hig_workarea_add_row( t, &row, _( "Torrent _location:" ), w, NULL );
140
140
    w = gtk_radio_button_new_with_mnemonic( NULL, _( "_Move from the current folder" ) );