Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2026-05-08 17:49:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

(gtk) fix some format mangling caused by uncrustify

Browse Source
This commit is contained in:
Charles Kerr
2008-10-07 15:17:52 +00:00
parent 8ced51a9e4
commit d9ee73c2a5
5 changed files with 57 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gtk/conf.c
+21 -22
View File
@@ -345,19 +345,19 @@ translate_08_to_09( const char* oldfile,
const char* oldkey;
const char* newkey;
} pref_table[] = {
{ "add-behavior-ipc", "add-behavior-ipc" },
{ "add-behavior-standard", "add-behavior-standard" },
{ "download-directory", "default-download-directory" },
{ "download-limit", "download-limit" },
{ "use-download-limit", "download-limit-enabled" },
{ "listening-port", "listening-port" },
{ "use-nat-traversal", "nat-traversal-enabled" },
{ "use-peer-exchange", "pex-enabled" },
{ "ask-quit", "prompt-before-exit" },
{ "ask-download-directory", "prompt-for-download-directory" },
{ "use-tray-icon", "system-tray-icon-enabled" },
{ "upload-limit", "upload-limit" },
{ "use-upload-limit", "upload-limit-enabled" }
{ "add-behavior-ipc", "add-behavior-ipc" },
{ "add-behavior-standard", "add-behavior-standard" },
{ "download-directory", "default-download-directory" },
{ "download-limit", "download-limit" },
{ "use-download-limit", "download-limit-enabled" },
{ "listening-port", "listening-port" },
{ "use-nat-traversal", "nat-traversal-enabled" },
{ "use-peer-exchange", "pex-enabled" },
{ "ask-quit", "prompt-before-exit" },
{ "ask-download-directory", "prompt-for-download-directory" },
{ "use-tray-icon", "system-tray-icon-enabled" },
{ "upload-limit", "upload-limit" },
{ "use-upload-limit", "upload-limit-enabled" }
};
GString * out = g_string_new( NULL );
@@ -404,18 +404,17 @@ translate_keyfile_to_json( const char * old_file,
gsize i;
gsize length;
static struct pref_entry
{
static struct pref_entry {
const char* oldkey;
const char* newkey;
} renamed[] = {
{ "default-download-directory", "download-dir" },
{ "encrypted-connections-only", "encryption" },
{ "listening-port", "peer-port" },
{ "nat-traversal-enabled", "port-forwarding-enabled" },
{ "open-dialog-folder", "open-dialog-dir" },
{ "watch-folder", "watch-dir" },
{ "watch-folder-enabled", "watch-dir-enabled" }
{ "default-download-directory", "download-dir" },
{ "encrypted-connections-only", "encryption" },
{ "listening-port", "peer-port" },
{ "nat-traversal-enabled", "port-forwarding-enabled" },
{ "open-dialog-folder", "open-dialog-dir" },
{ "watch-folder", "watch-dir" },
{ "watch-folder-enabled", "watch-dir-enabled" }
};
keyfile = g_key_file_new( );
gtk/main.c
+16 -19
View File
@@ -251,8 +251,8 @@ onMainWindowSizeAllocated( GtkWidget * window,
gpointer gdata UNUSED )
{
const gboolean isMaximized = window->window
&& ( gdk_window_get_state( window->window )
& GDK_WINDOW_STATE_MAXIMIZED );
&& ( gdk_window_get_state( window->window )
& GDK_WINDOW_STATE_MAXIMIZED );
if( !isMaximized )
{
@@ -285,8 +285,8 @@ static sig_atomic_t global_sigcount = 0;
static void
fatalsig( int sig )
{
static const int SIGCOUNT_MAX = 3; /* revert to default handler after this
many */
/* revert to default handler after this many */
static const int SIGCOUNT_MAX = 3;
if( ++global_sigcount >= SIGCOUNT_MAX )
{
@@ -363,19 +363,17 @@ main( int argc,
char * configDir = NULL;
tr_lockfile_state_t tr_state;
GOptionEntry entries[] = {
{ "paused", 'p', 0, G_OPTION_ARG_NONE,
&startpaused,
_( "Start with all torrents paused" ), NULL },
GOptionEntry entries[] = {
{ "paused", 'p', 0, G_OPTION_ARG_NONE,
&startpaused, _( "Start with all torrents paused" ), NULL },
#ifdef STATUS_ICON_SUPPORTED
{ "minimized", 'm', 0, G_OPTION_ARG_NONE,
{ "minimized", 'm', 0, G_OPTION_ARG_NONE,
&startminimized,
_( "Start minimized in system tray" ), NULL },
#endif
{ "config-dir", 'g', 0, G_OPTION_ARG_FILENAME, &configDir,
{ "config-dir", 'g', 0, G_OPTION_ARG_FILENAME, &configDir,
_( "Where to look for configuration files" ), NULL },
{ NULL, 0, 0, 0, NULL,
NULL, NULL }
{ NULL, 0, 0, 0, NULL, NULL, NULL }
};
cbdata = g_new0( struct cbdata, 1 );
@@ -974,9 +972,9 @@ setupdrag( GtkWidget * widget,
struct cbdata *data )
{
GtkTargetEntry targets[] = {
{ "STRING", 0, 0 },
{ "text/plain", 0, 0 },
{ "text/uri-list", 0, 0 },
{ "STRING", 0, 0 },
{ "text/plain", 0, 0 },
{ "text/uri-list", 0, 0 },
};
g_signal_connect( widget, "drag_data_received", G_CALLBACK(
@@ -1519,11 +1517,10 @@ doAction( const char * action_name,
{
if( NULL == data->prefs )
{
data->prefs = tr_prefs_dialog_new( G_OBJECT(
data->core ), data->wind );
data->prefs = tr_prefs_dialog_new( G_OBJECT( data->core ),
data->wind );
g_signal_connect( data->prefs, "destroy",
G_CALLBACK(
gtk_widget_destroyed ), &data->prefs );
G_CALLBACK( gtk_widget_destroyed ), &data->prefs );
gtk_widget_show( GTK_WIDGET( data->prefs ) );
}
}
gtk/torrent-cell-renderer.c
+12 -14
View File
@@ -204,24 +204,22 @@ getStatusString( const tr_stat * torStat )
case TR_STATUS_DOWNLOAD:
g_string_append_printf( gstr,
ngettext(
"Downloading from %1$'d of %2$'d connected peer",
"Downloading from %1$'d of %2$'d connected peers",
torStat->peersConnected ),
torStat->peersSendingToUs +
torStat->webseedsSendingToUs,
torStat->peersConnected +
torStat->webseedsSendingToUs );
ngettext( "Downloading from %1$'d of %2$'d connected peer",
"Downloading from %1$'d of %2$'d connected peers",
torStat->peersConnected ),
torStat->peersSendingToUs +
torStat->webseedsSendingToUs,
torStat->peersConnected +
torStat->webseedsSendingToUs );
break;
case TR_STATUS_SEED:
g_string_append_printf( gstr,
ngettext(
"Seeding to %1$'d of %2$'d connected peer",
"Seeding to %1$'d of %2$'d connected peers",
torStat->peersConnected ),
torStat->peersGettingFromUs,
torStat->peersConnected );
ngettext( "Seeding to %1$'d of %2$'d connected peer",
"Seeding to %1$'d of %2$'d connected peers",
torStat->peersConnected ),
torStat->peersGettingFromUs,
torStat->peersConnected );
break;
}
gtk/tr-prefs.c
+3 -5
View File
@@ -128,8 +128,8 @@ tr_prefs_init_global( void )
pref_flag_set_default ( PREF_KEY_RPC_ENABLED, TR_DEFAULT_RPC_ENABLED );
pref_int_set_default ( PREF_KEY_RPC_PORT, TR_DEFAULT_RPC_PORT );
pref_string_set_default ( PREF_KEY_RPC_WHITELIST, TR_DEFAULT_RPC_WHITELIST );
pref_flag_set_default ( PREF_KEY_RPC_WHITELIST_ENABLED, TR_DEFAULT_RPC_WHITELIST_ENABLED );
pref_flag_set_default ( PREF_KEY_RPC_WHITELIST_ENABLED,
TR_DEFAULT_RPC_WHITELIST_ENABLED );
rand = g_rand_new ( );
for( i = 0; i < 16; ++i )
@@ -829,9 +829,7 @@ webPage( GObject * core )
page->whitelist_widgets = g_slist_append( page->whitelist_widgets, w );
v = page->view = GTK_TREE_VIEW( w );
gtk_tooltips_set_tip( tips, w,
_(
"IP addresses may use wildcards, such as 192.168.*.*" ),
NULL );
_( "IP addresses may use wildcards, such as 192.168.*.*" ), NULL );
sel = gtk_tree_view_get_selection( v );
g_signal_connect( sel, "changed",
G_CALLBACK( onWhitelistSelectionChanged ), page );
gtk/tracker-list.c
+5 -3
View File
@@ -103,9 +103,11 @@ onTrackerSelectionChanged( GtkTreeSelection * sel,
gpointer gpage )
{
struct tracker_page * page = gpage;
const gboolean has_selection = gtk_tree_selection_count_selected_rows( sel ) > 0;
const int trackerCount = gtk_tree_model_iter_n_children( GTK_TREE_MODEL( page->store ), NULL );
const gboolean ok_to_remove = !page->gtor || ( trackerCount > 1 );
const gboolean has_selection =
gtk_tree_selection_count_selected_rows( sel ) > 0;
GtkTreeModel * model = GTK_TREE_MODEL( page->store );
const int trackerCount = gtk_tree_model_iter_n_children( model, NULL );
const gboolean ok_to_remove = !page->gtor || ( trackerCount > 1 );
gtk_widget_set_sensitive( page->remove_button, has_selection && ok_to_remove );
}