mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(gtk) minor hack: when adding a duplicate torrent, don't pop up a warning dialog iff the duplicate was in the watch directory. otherwise if users don't clean out their watch directory we'd be nagging them every time they restart Transmission. :/

This commit is contained in:
Charles Kerr 2008-10-27 20:12:53 +00:00
parent 9fe6f403eb
commit 4bb732c455
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/tr-core.c
View File

@ -59,6 +59,7 @@ struct TrCorePrivate
GSList * monitor_files; GSList * monitor_files;
guint monitor_idle_tag; guint monitor_idle_tag;
#endif #endif
gboolean adding_from_watch_dir;
gboolean inhibit_allowed; gboolean inhibit_allowed;
gboolean have_inhibit_cookie; gboolean have_inhibit_cookie;
gboolean dbus_error; gboolean dbus_error;
@ -473,7 +474,9 @@ watchFolderIdle( gpointer gcore )
{ {
TrCore * core = TR_CORE( gcore ); TrCore * core = TR_CORE( gcore );
core->priv->adding_from_watch_dir = TRUE;
tr_core_add_list_defaults( core, core->priv->monitor_files ); tr_core_add_list_defaults( core, core->priv->monitor_files );
core->priv->adding_from_watch_dir = FALSE;
/* cleanup */ /* cleanup */
core->priv->monitor_files = NULL; core->priv->monitor_files = NULL;
@ -867,7 +870,14 @@ add_filename( TrCore * core,
} }
else if( ( err = tr_torrentParse( handle, ctor, NULL ) ) ) else if( ( err = tr_torrentParse( handle, ctor, NULL ) ) )
{ {
tr_core_errsig( core, err, filename ); /* don't complain about .torrent files in the watch directory
that have already been added... that gets annoying, and we
don't want to nag about cleaning up the watch dir */
const gboolean quiet = ( err == TR_EDUPLICATE )
&& ( core->priv->adding_from_watch_dir );
if( !quiet )
tr_core_errsig( core, err, filename );
tr_ctorFree( ctor ); tr_ctorFree( ctor );
} }
else if( doPrompt ) else if( doPrompt )