mirror of
https://github.com/transmission/transmission
synced 2025-03-13 07:33:02 +00:00
set a default window size for the debug window
This commit is contained in:
Charles Kerr
parent
8e401729cd
commit
008938b62f
6 changed files with 95 additions and 124 deletions
|
|
@ -972,7 +972,7 @@ smsg_pref( enum ipc_msg id, benc_val_t * val SHUTUP, int64_t tag, void * arg )
|
|||
case IPC_MSG_GETDIR:
|
||||
pref = tr_prefs_get( PREF_ID_ASKDIR );
|
||||
/* XXX sending back "" when we're prompting is kind of bogus */
|
||||
pref = ( NULL != pref && strbool( pref ) ? "" : getdownloaddir() );
|
||||
pref = strbool( pref ) ? "" : getdownloaddir();
|
||||
buf = ipc_mkstr( &con->ipc, &size, IPC_MSG_DIR, tag, pref );
|
||||
break;
|
||||
case IPC_MSG_GETDOWNLIMIT:
|
||||
|
|
|
|||
|
|
@ -225,6 +225,7 @@ msgwin_create( TrCore * core )
|
|||
int ii, curlevel;
|
||||
|
||||
win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
|
||||
gtk_window_set_default_size( GTK_WINDOW( win ), 600, 400 );
|
||||
gtk_window_set_role( GTK_WINDOW( win ), "debug-window" );
|
||||
vbox = gtk_vbox_new( FALSE, 0 );
|
||||
|
||||
|
|
|
|||
|
|
@ -341,16 +341,10 @@ tr_core_quiescent( TrCore * self )
|
|||
return TR_NAT_TRAVERSAL_DISABLED == hstat->natTraversalStatus;
|
||||
}
|
||||
|
||||
int
|
||||
tr_core_check_torrents( TrCore * self )
|
||||
{
|
||||
return gtk_tree_model_iter_n_children( self->model, NULL );
|
||||
}
|
||||
|
||||
void
|
||||
tr_core_save( TrCore * self )
|
||||
{
|
||||
benc_val_t state, * item;
|
||||
benc_val_t state;
|
||||
int count;
|
||||
GtkTreeIter iter;
|
||||
TrTorrent * tor;
|
||||
|
|
@ -359,16 +353,7 @@ tr_core_save( TrCore * self )
|
|||
|
||||
TR_IS_CORE( self );
|
||||
|
||||
count = 0;
|
||||
|
||||
if( gtk_tree_model_get_iter_first( self->model, &iter) )
|
||||
{
|
||||
do
|
||||
{
|
||||
count++;
|
||||
}
|
||||
while( gtk_tree_model_iter_next( self->model, &iter ) );
|
||||
}
|
||||
count = gtk_tree_model_iter_n_children( self->model, NULL );
|
||||
|
||||
tr_bencInit( &state, TYPE_LIST );
|
||||
if( tr_bencListReserve( &state, count ) )
|
||||
|
|
@ -378,11 +363,9 @@ tr_core_save( TrCore * self )
|
|||
}
|
||||
|
||||
saved = NULL;
|
||||
if( gtk_tree_model_get_iter_first( self->model, &iter) )
|
||||
if( gtk_tree_model_get_iter_first( self->model, &iter) ) do
|
||||
{
|
||||
do
|
||||
{
|
||||
item = tr_bencListAdd( &state );
|
||||
benc_val_t * item = tr_bencListAdd( &state );
|
||||
gtk_tree_model_get( self->model, &iter, MC_TORRENT, &tor, -1 );
|
||||
if( tr_torrent_get_state( tor, item ) )
|
||||
{
|
||||
|
|
@ -396,7 +379,6 @@ tr_core_save( TrCore * self )
|
|||
g_object_unref( tor );
|
||||
}
|
||||
while( gtk_tree_model_iter_next( self->model, &iter ) );
|
||||
}
|
||||
|
||||
errstr = NULL;
|
||||
cf_savestate( &state, &errstr );
|
||||
|
|
@ -413,31 +395,25 @@ tr_core_save( TrCore * self )
|
|||
tr_torrent_state_saved( ii->data );
|
||||
}
|
||||
}
|
||||
if( NULL != saved )
|
||||
{
|
||||
|
||||
g_list_free( saved );
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
tr_core_load( TrCore * self, benc_val_t * state, gboolean forcepaused )
|
||||
tr_core_load( TrCore * self, const benc_val_t * state, gboolean forcepaused )
|
||||
{
|
||||
int ii, count;
|
||||
char * errstr;
|
||||
TrTorrent * tor;
|
||||
int count = 0;
|
||||
|
||||
TR_IS_CORE( self );
|
||||
|
||||
if( TYPE_LIST != state->type )
|
||||
if( TYPE_LIST == state->type )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
count = 0;
|
||||
int ii;
|
||||
for( ii = 0; ii < state->val.l.count; ii++ )
|
||||
{
|
||||
errstr = NULL;
|
||||
tor = tr_torrent_new_with_state( self->handle, state->val.l.vals + ii,
|
||||
char * errstr = NULL;
|
||||
TrTorrent * tor = tr_torrent_new_with_state( self->handle,
|
||||
state->val.l.vals + ii,
|
||||
forcepaused, &errstr );
|
||||
if( NULL == tor )
|
||||
{
|
||||
|
|
@ -451,6 +427,7 @@ tr_core_load( TrCore * self, benc_val_t * state, gboolean forcepaused )
|
|||
count++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
|
@ -499,14 +476,13 @@ int
|
|||
tr_core_add_list( TrCore * self, GList * paths, enum tr_torrent_action act,
|
||||
gboolean paused )
|
||||
{
|
||||
const char * pref = tr_prefs_get( PREF_ID_ASKDIR );
|
||||
TrCoreClass * class;
|
||||
const char * pref;
|
||||
int count;
|
||||
|
||||
TR_IS_CORE( self );
|
||||
|
||||
pref = tr_prefs_get( PREF_ID_ASKDIR );
|
||||
if( NULL != pref && strbool( pref ) )
|
||||
if( strbool( pref ) )
|
||||
{
|
||||
class = g_type_class_peek( TR_CORE_TYPE );
|
||||
g_signal_emit( self, class->promptsig, 0, paths, act, paused );
|
||||
|
|
@ -515,15 +491,9 @@ tr_core_add_list( TrCore * self, GList * paths, enum tr_torrent_action act,
|
|||
|
||||
pref = getdownloaddir();
|
||||
count = 0;
|
||||
paths = g_list_first( paths );
|
||||
while( NULL != paths )
|
||||
{
|
||||
for( ; paths; paths=paths->next )
|
||||
if( tr_core_add_dir( self, paths->data, pref, act, paused ) )
|
||||
{
|
||||
count++;
|
||||
}
|
||||
paths = paths->next;
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
|
@ -531,15 +501,13 @@ tr_core_add_list( TrCore * self, GList * paths, enum tr_torrent_action act,
|
|||
gboolean
|
||||
tr_core_add_data( TrCore * self, uint8_t * data, size_t size, gboolean paused )
|
||||
{
|
||||
TrCoreClass * class;
|
||||
const char * pref;
|
||||
const char * pref = tr_prefs_get( PREF_ID_ASKDIR );
|
||||
|
||||
TR_IS_CORE( self );
|
||||
|
||||
pref = tr_prefs_get( PREF_ID_ASKDIR );
|
||||
if( NULL != pref && strbool( pref ) )
|
||||
if( strbool( pref ) )
|
||||
{
|
||||
class = g_type_class_peek( TR_CORE_TYPE );
|
||||
TrCoreClass * class = g_type_class_peek( TR_CORE_TYPE );
|
||||
g_signal_emit( self, class->promptdatasig, 0, data, size, paused );
|
||||
return FALSE;
|
||||
}
|
||||
|
|
@ -552,11 +520,10 @@ tr_core_add_data_dir( TrCore * self, uint8_t * data, size_t size,
|
|||
const char * dir, gboolean paused )
|
||||
{
|
||||
TrTorrent * tor;
|
||||
char * errstr;
|
||||
char * errstr = NULL;
|
||||
|
||||
TR_IS_CORE( self );
|
||||
|
||||
errstr = NULL;
|
||||
tor = tr_torrent_new_with_data( self->handle, data, size, dir,
|
||||
paused, &errstr );
|
||||
if( NULL == tor )
|
||||
|
|
@ -626,9 +593,7 @@ tr_core_update( TrCore * self )
|
|||
|
||||
TR_IS_CORE( self );
|
||||
|
||||
if( gtk_tree_model_get_iter_first( self->model, &iter ) )
|
||||
{
|
||||
do
|
||||
if( gtk_tree_model_get_iter_first( self->model, &iter ) ) do
|
||||
{
|
||||
gtk_tree_model_get( self->model, &iter, MC_TORRENT, &tor, -1 );
|
||||
st = tr_torrent_stat( tor );
|
||||
|
|
@ -658,7 +623,6 @@ tr_core_update( TrCore * self )
|
|||
-1 );
|
||||
}
|
||||
while( gtk_tree_model_iter_next( self->model, &iter ) );
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -690,22 +654,12 @@ tr_core_set_pref( TrCore * self, int id, const char * val )
|
|||
|
||||
TR_IS_CORE( self );
|
||||
|
||||
/* don't change anything if the new value is the same as the old one */
|
||||
name = tr_prefs_name( id );
|
||||
old = cf_getpref( name );
|
||||
if( NULL == old )
|
||||
{
|
||||
if( old == val )
|
||||
{
|
||||
if( !tr_strcmp( old, val ) )
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if( 0 == strcmp( old, val ) )
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
cf_setpref( name, val );
|
||||
|
||||
/* write prefs to disk */
|
||||
|
|
|
|||
|
|
@ -123,7 +123,7 @@ tr_core_save( TrCore * self );
|
|||
/* Load saved state, return number of torrents added. May trigger one
|
||||
or more "error" signals with TR_CORE_ERR_ADD_TORRENT */
|
||||
int
|
||||
tr_core_load( TrCore * self, benc_val_t * state, gboolean forcepaused );
|
||||
tr_core_load( TrCore * self, const benc_val_t * state, gboolean forcepaused );
|
||||
|
||||
/* Any the tr_core_add functions below may trigger an "error" signal
|
||||
with TR_CORE_ERR_ADD_TORRENT */
|
||||
|
|
|
|||
15
gtk/util.c
15
gtk/util.c
|
|
@ -42,8 +42,21 @@
|
|||
static void
|
||||
errcb(GtkWidget *wind, int resp, gpointer data);
|
||||
|
||||
int
|
||||
tr_strcmp( const char * a, const char * b )
|
||||
{
|
||||
if( a && b ) return strcmp( a, b );
|
||||
if( a ) return 1;
|
||||
if( b ) return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
gboolean
|
||||
strbool(const char *str) {
|
||||
strbool( const char * str )
|
||||
{
|
||||
if( !str )
|
||||
return FALSE;
|
||||
|
||||
switch(str[0]) {
|
||||
case 'y':
|
||||
case 'Y':
|
||||
|
|
|
|||
|
|
@ -37,6 +37,9 @@
|
|||
#define UNUSED
|
||||
#endif
|
||||
|
||||
/* NULL-safe version of strcmp */
|
||||
int tr_strcmp( const char*, const char * );
|
||||
|
||||
/* XXX this shouldn't be here */
|
||||
enum tr_torrent_action { TR_TOR_LEAVE, TR_TOR_COPY, TR_TOR_MOVE };
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue