1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-20 21:26:53 +00:00

(trunk gtk) #3697 "make blocklist URL configurable" -- better error handling in GTK+ client if the user-specified blocklist can't be fetched

This commit is contained in:
Charles Kerr 2010-11-13 17:05:22 +00:00
parent 57e918d196
commit 04c60c7221
2 changed files with 6 additions and 4 deletions

View file

@ -1693,7 +1693,7 @@ static void
blocklistResponseFunc( TrCore * core, tr_benc * response, gpointer userData UNUSED )
{
tr_benc * args;
int64_t ruleCount = 0;
int64_t ruleCount = -1;
if( tr_bencDictFindDict( response, "arguments", &args ) )
tr_bencDictFindInt( args, "blocklist-size", &ruleCount );

View file

@ -425,12 +425,14 @@ onBlocklistUpdateResponse( GtkDialog * dialog, gint response UNUSED, gpointer gd
static void
onBlocklistUpdated( TrCore * core, int n, gpointer gdata )
{
const char * s = gtr_ngettext( "Blocklist now has %'d rule.", "Blocklist now has %'d rules.", n );
const tr_bool success = n >= 0;
const int count = n >=0 ? n : tr_blocklistGetRuleCount( tr_core_session( core ) );
const char * s = gtr_ngettext( "Blocklist has %'d rule.", "Blocklist has %'d rules.", count );
struct blocklist_data * data = gdata;
GtkMessageDialog * d = GTK_MESSAGE_DIALOG( data->updateBlocklistDialog );
gtk_widget_set_sensitive( data->updateBlocklistButton, TRUE );
gtk_message_dialog_set_markup( d, _( "<b>Update succeeded!</b>" ) );
gtk_message_dialog_format_secondary_text( d, s, n );
gtk_message_dialog_set_markup( d, success ? _( "<b>Update succeeded!</b>" ) : _( "<b>Unable to update.</b>" ) );
gtk_message_dialog_format_secondary_text( d, s, count );
updateBlocklistText( data->label, core );
}