[Rawstudio-commit] r3076 - trunk/plugins/output-flickr

[Anders Kvist]

Author: akv
Date: 2010-01-24 22:15:40 +0100 (Sun, 24 Jan 2010)
New Revision: 3076

Modified:
   trunk/plugins/output-flickr/output-flickr.c
Log:
Simplified usage of filename when exporting from batch.

Modified: trunk/plugins/output-flickr/output-flickr.c
===================================================================
--- trunk/plugins/output-flickr/output-flickr.c 2010-01-24 21:04:15 UTC (rev 
3075)
+++ trunk/plugins/output-flickr/output-flickr.c 2010-01-24 21:15:40 UTC (rev 
3076)
@@ -443,13 +443,11 @@
 
        flickcurl_set_auth_token (fc, flickr_user_token);
 
-       gchar *filename = g_path_get_basename(flickr->filename);
+       if (flickr->filename)
+               flickr->title = g_path_get_basename(flickr->filename);
 
        upload_params->photo_file = temp_file;
-       if (flickr->title)
-               upload_params->title = flickr->title;
-       else /* Probably batch export */
-               upload_params->title = filename;
+       upload_params->title = flickr->title;
        upload_params->description = flickr->description;
        upload_params->tags = flickr->tags;
        upload_params->is_public = flickr->is_public;
@@ -463,7 +461,6 @@
 
        unlink (temp_file);
        g_free (temp_file);
-       g_free (filename);
 
        flickcurl_free (fc);
        flickcurl_finish ();            /* optional static free of resources */


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit