(trunk) silence some minor gcc warnings
This commit is contained in:
parent
993bb0535d
commit
1ae47c697d
|
@ -298,6 +298,10 @@ if test "x$build_gtk" = "xyes" -a "x$enable_nls" = "xno" ; then
|
||||||
AC_MSG_ERROR("The gtk client cannot be built without nls support. Try adding either --enable-nls or --disable-gtk" )
|
AC_MSG_ERROR("The gtk client cannot be built without nls support. Try adding either --enable-nls or --disable-gtk" )
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl This section is only used for internationalization.
|
||||||
|
dnl If you don't need translations and this section gives you trouble --
|
||||||
|
dnl such as if you're building for a headless system --
|
||||||
|
dnl it's okay to tear this section out and re-build the configure script.
|
||||||
use_nls=no
|
use_nls=no
|
||||||
if test "x$enable_nls" = "xyes" ; then
|
if test "x$enable_nls" = "xyes" ; then
|
||||||
use_nls=yes
|
use_nls=yes
|
||||||
|
|
|
@ -499,7 +499,7 @@ options_page_new( struct DetailsImpl * d )
|
||||||
{
|
{
|
||||||
guint tag;
|
guint tag;
|
||||||
int row;
|
int row;
|
||||||
char *s;
|
const char *s;
|
||||||
GSList *group;
|
GSList *group;
|
||||||
GtkWidget *t, *w, *tb, *h;
|
GtkWidget *t, *w, *tb, *h;
|
||||||
|
|
||||||
|
|
|
@ -370,7 +370,7 @@ main( int argc,
|
||||||
g_thread_init( NULL );
|
g_thread_init( NULL );
|
||||||
|
|
||||||
gerr = NULL;
|
gerr = NULL;
|
||||||
if( !gtk_init_with_args( &argc, &argv, _( "[torrent files]" ), entries,
|
if( !gtk_init_with_args( &argc, &argv, (char*)_( "[torrent files]" ), entries,
|
||||||
(char*)domain, &gerr ) )
|
(char*)domain, &gerr ) )
|
||||||
{
|
{
|
||||||
fprintf( stderr, "%s\n", gerr->message );
|
fprintf( stderr, "%s\n", gerr->message );
|
||||||
|
|
|
@ -1163,11 +1163,10 @@ gtr_inhibit_hibernation( guint * cookie )
|
||||||
G_TYPE_UINT, cookie,
|
G_TYPE_UINT, cookie,
|
||||||
G_TYPE_INVALID );
|
G_TYPE_INVALID );
|
||||||
if( success )
|
if( success )
|
||||||
tr_inf( _( "Disallowing desktop hibernation" ) );
|
tr_inf( "%s", _( "Disallowing desktop hibernation" ) );
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
tr_err( _(
|
tr_err( _( "Couldn't disable desktop hibernation: %s" ),
|
||||||
"Couldn't disable desktop hibernation: %s" ),
|
|
||||||
error->message );
|
error->message );
|
||||||
g_error_free( error );
|
g_error_free( error );
|
||||||
}
|
}
|
||||||
|
@ -1191,7 +1190,7 @@ gtr_uninhibit_hibernation( guint inhibit_cookie )
|
||||||
G_TYPE_INVALID,
|
G_TYPE_INVALID,
|
||||||
G_TYPE_INVALID );
|
G_TYPE_INVALID );
|
||||||
if( success )
|
if( success )
|
||||||
tr_inf( _( "Allowing desktop hibernation" ) );
|
tr_inf( "%s", _( "Allowing desktop hibernation" ) );
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
g_warning( "Couldn't uninhibit the system from suspending: %s.",
|
g_warning( "Couldn't uninhibit the system from suspending: %s.",
|
||||||
|
|
|
@ -418,9 +418,9 @@ onBlocklistUpdate( GtkButton * w, gpointer gdata )
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
GTK_MESSAGE_INFO,
|
GTK_MESSAGE_INFO,
|
||||||
GTK_BUTTONS_CLOSE,
|
GTK_BUTTONS_CLOSE,
|
||||||
_( "Update Blocklist" ) );
|
"%s", _( "Update Blocklist" ) );
|
||||||
gtk_widget_set_sensitive( data->updateBlocklistButton, FALSE );
|
gtk_widget_set_sensitive( data->updateBlocklistButton, FALSE );
|
||||||
gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( d ), _( "Getting new blocklist..." ) );
|
gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( d ), "%s", _( "Getting new blocklist..." ) );
|
||||||
data->updateBlocklistDialog = d;
|
data->updateBlocklistDialog = d;
|
||||||
g_signal_connect( d, "response", G_CALLBACK(onBlocklistUpdateResponse), data );
|
g_signal_connect( d, "response", G_CALLBACK(onBlocklistUpdateResponse), data );
|
||||||
gtk_widget_show( d );
|
gtk_widget_show( d );
|
||||||
|
|
|
@ -393,7 +393,7 @@ addTorrentErrorDialog( GtkWidget * child,
|
||||||
GTK_DIALOG_DESTROY_WITH_PARENT,
|
GTK_DIALOG_DESTROY_WITH_PARENT,
|
||||||
GTK_MESSAGE_ERROR,
|
GTK_MESSAGE_ERROR,
|
||||||
GTK_BUTTONS_CLOSE,
|
GTK_BUTTONS_CLOSE,
|
||||||
_( "Error opening torrent" ) );
|
"%s", _( "Error opening torrent" ) );
|
||||||
gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( w ),
|
gtk_message_dialog_format_secondary_text( GTK_MESSAGE_DIALOG( w ),
|
||||||
"%s", secondary );
|
"%s", secondary );
|
||||||
g_signal_connect_swapped( w, "response",
|
g_signal_connect_swapped( w, "response",
|
||||||
|
|
|
@ -1055,7 +1055,7 @@ bencWalk( const tr_benc * top,
|
||||||
|
|
||||||
default:
|
default:
|
||||||
/* did caller give us an uninitialized val? */
|
/* did caller give us an uninitialized val? */
|
||||||
tr_err( _( "Invalid metadata" ) );
|
tr_err( "%s", _( "Invalid metadata" ) );
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -550,7 +550,7 @@ fastResumeLoadImpl( tr_torrent * tor,
|
||||||
|
|
||||||
if( !buf )
|
if( !buf )
|
||||||
/* %s is the torrent name */
|
/* %s is the torrent name */
|
||||||
tr_torinf( tor, _( "Couldn't read resume file" ) );
|
tr_torinf( tor, "%s", _( "Couldn't read resume file" ) );
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
const uint8_t * walk = buf;
|
const uint8_t * walk = buf;
|
||||||
|
@ -563,7 +563,7 @@ fastResumeLoadImpl( tr_torrent * tor,
|
||||||
ret |= parseVersion1 ( tor, walk, end, fieldsToLoad );
|
ret |= parseVersion1 ( tor, walk, end, fieldsToLoad );
|
||||||
else
|
else
|
||||||
/* %s is the torrent name */
|
/* %s is the torrent name */
|
||||||
tr_torinf( tor, _( "Couldn't read resume file" ) );
|
tr_torinf( tor, "%s", _( "Couldn't read resume file" ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
tr_free( buf );
|
tr_free( buf );
|
||||||
|
|
|
@ -163,7 +163,7 @@ stop_timer( tr_shared * s )
|
||||||
static void
|
static void
|
||||||
stop_forwarding( tr_shared * s )
|
stop_forwarding( tr_shared * s )
|
||||||
{
|
{
|
||||||
tr_ninf( getKey( ), _( "Stopped" ) );
|
tr_ninf( getKey( ), "%s", _( "Stopped" ) );
|
||||||
natPulse( s, FALSE );
|
natPulse( s, FALSE );
|
||||||
tr_natpmpClose( s->natpmp );
|
tr_natpmpClose( s->natpmp );
|
||||||
s->natpmp = NULL;
|
s->natpmp = NULL;
|
||||||
|
|
|
@ -945,10 +945,10 @@ tr_rpcInit( tr_session * session,
|
||||||
tr_runInEventThread( session, startServer, s );
|
tr_runInEventThread( session, startServer, s );
|
||||||
|
|
||||||
if( s->isWhitelistEnabled )
|
if( s->isWhitelistEnabled )
|
||||||
tr_ninf( MY_NAME, _( "Whitelist enabled" ) );
|
tr_ninf( MY_NAME, "%s", _( "Whitelist enabled" ) );
|
||||||
|
|
||||||
if( s->isPasswordEnabled )
|
if( s->isPasswordEnabled )
|
||||||
tr_ninf( MY_NAME, _( "Password required" ) );
|
tr_ninf( MY_NAME, "%s", _( "Password required" ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
return s;
|
return s;
|
||||||
|
|
|
@ -194,7 +194,7 @@ tr_upnpPulse( tr_upnp * handle,
|
||||||
handle->lanaddr, port );
|
handle->lanaddr, port );
|
||||||
if( handle->isMapped )
|
if( handle->isMapped )
|
||||||
{
|
{
|
||||||
tr_ninf( getKey( ), _( "Port forwarding successful!" ) );
|
tr_ninf( getKey( ), "%s", _( "Port forwarding successful!" ) );
|
||||||
handle->port = port;
|
handle->port = port;
|
||||||
handle->state = TR_UPNP_IDLE;
|
handle->state = TR_UPNP_IDLE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -209,7 +209,7 @@ verifyThreadFunc( void * unused UNUSED )
|
||||||
tr_free( node );
|
tr_free( node );
|
||||||
tr_lockUnlock( getVerifyLock( ) );
|
tr_lockUnlock( getVerifyLock( ) );
|
||||||
|
|
||||||
tr_torinf( tor, _( "Verifying torrent" ) );
|
tr_torinf( tor, "%s", _( "Verifying torrent" ) );
|
||||||
tr_torrentSetVerifyState( tor, TR_VERIFY_NOW );
|
tr_torrentSetVerifyState( tor, TR_VERIFY_NOW );
|
||||||
changed = verifyTorrent( tor, &stopCurrent );
|
changed = verifyTorrent( tor, &stopCurrent );
|
||||||
tr_torrentSetVerifyState( tor, TR_VERIFY_NONE );
|
tr_torrentSetVerifyState( tor, TR_VERIFY_NONE );
|
||||||
|
@ -244,7 +244,7 @@ tr_verifyAdd( tr_torrent * tor,
|
||||||
{
|
{
|
||||||
struct verify_node * node;
|
struct verify_node * node;
|
||||||
|
|
||||||
tr_torinf( tor, _( "Queued for verification" ) );
|
tr_torinf( tor, "%s", _( "Queued for verification" ) );
|
||||||
|
|
||||||
node = tr_new( struct verify_node, 1 );
|
node = tr_new( struct verify_node, 1 );
|
||||||
node->torrent = tor;
|
node->torrent = tor;
|
||||||
|
|
Loading…
Reference in New Issue