# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1194898424 -32400
# Node ID bcd729411d7c608218bea163af60047f2e38eb6d
# Parent  c4b97a9c1f6b2d70fc85a68cdf802d5b6547d550# Parent  e6522a66278a05ec5454e9dad21e98d2064d35fe
branch merge.

diff -r c4b97a9c1f6b -r bcd729411d7c src/mtp_up/mtp.c
--- a/src/mtp_up/mtp.c	Tue Nov 13 05:11:47 2007 +0900
+++ b/src/mtp_up/mtp.c	Tue Nov 13 05:13:44 2007 +0900
@@ -123,32 +123,41 @@
 LIBMTP_track_t *track_metadata(Tuple *from_tuple)
 {
     LIBMTP_track_t *tr;
-    gchar *filename, *from_path;
+    gchar *filename, *uri_path;
     VFSFile *f;
     uint64_t filesize;
     uint32_t parent_id = 0;
     struct stat sb;
 
-    from_path = g_strdup_printf("%s/%s", aud_tuple_get_string(from_tuple, FIELD_FILE_PATH, NULL), aud_tuple_get_string(from_tuple, FIELD_FILE_NAME, NULL));
-    gchar *tmp;
-    tmp = g_strescape(from_path,NULL);
+    uri_path = g_strdup_printf("%s/%s", aud_tuple_get_string(from_tuple, FIELD_FILE_PATH, NULL), aud_tuple_get_string(from_tuple, FIELD_FILE_NAME, NULL));
+    gchar *tmp = g_strescape(uri_path,NULL);
     filename=g_filename_from_uri(tmp,NULL,NULL);
+    g_free(tmp); 
     /* dealing the stream upload (invalidating)*/
     if(filename)
     {
-        f = aud_vfs_fopen(from_path,"r");
+        f = aud_vfs_fopen(uri_path,"r");
+        g_free(uri_path);
         if(aud_vfs_is_streaming(f)) 
         {
             aud_vfs_fclose(f);
+            g_free(filename);
             return NULL;
         }
     }       
+    else 
+    {
+        g_print("Warning! the filename is NULL, exiting");
+        return NULL;
+        
+    }
 
-    if ( stat(from_path, &sb) == -1 )
+    if ( stat(filename, &sb) == -1 )
     {
 #if DEBUG
-        g_print("ERROR! encountered while stat()'ing \"%s\"\n",from_path);
+        g_print("ERROR! encountered while stat()'ing \"%s\"\n",filename);
 #endif
+        g_free(filename);
         return NULL;
     }
     filesize = (uint64_t) sb.st_size;
@@ -162,43 +171,44 @@
     tr->filesize = filesize;
     tr->filename = g_strdup(aud_tuple_get_string(from_tuple, FIELD_FILE_NAME, NULL));
     tr->duration = (uint32_t)aud_tuple_get_int(from_tuple, FIELD_LENGTH, NULL);
-    tr->filetype = find_filetype (from_path);
+    tr->filetype = find_filetype (filename);
     tr->genre = g_strdup((gchar*)aud_tuple_get_string(from_tuple, FIELD_GENRE, NULL));
     tr->date = g_strdup_printf("%d",aud_tuple_get_int(from_tuple, FIELD_YEAR, NULL));
     g_free(filename);
-    g_free(from_path);
-    g_free(tmp); 
     return tr;
 }
 
 gint upload_file(Tuple *from_tuple)
 {
     int ret;
-    gchar *comp, *from_path = NULL;
+    gchar *tmp, *from_path = NULL, *filename;
     uint32_t parent_id = 0;
     LIBMTP_track_t *gentrack;
     gentrack = track_metadata(from_tuple);
     from_path = g_strdup_printf("%s/%s", aud_tuple_get_string(from_tuple, FIELD_FILE_PATH, NULL), aud_tuple_get_string(from_tuple, FIELD_FILE_NAME, NULL));
     if(gentrack == NULL) return 1;
-    comp = g_strescape(from_path,NULL);
+    tmp = g_strescape(from_path,NULL);
+    filename=g_filename_from_uri(tmp,NULL,NULL);
+
     g_free(from_path);
+    g_free(tmp);
     parent_id = mtp_device->default_music_folder;
 
 #if DEBUG
-    g_print("Uploading track '%s'\n",comp);
+    g_print("Uploading track '%s'\n",filename);
 #endif
-    ret = LIBMTP_Send_Track_From_File(mtp_device, comp , gentrack, NULL , NULL, parent_id);
+    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL, parent_id);
     LIBMTP_destroy_track_t(gentrack);
-    g_free(comp);
     if (ret == 0) 
         g_print("Track upload finished!\n");
     else
     {
-        g_print("An error has occured while uploading '%s'...\nUpload failed!!!\n\n",comp);
+        g_print("An error has occured while uploading '%s'...\nUpload failed!!!\n\n",filename);
         mtp_initialised = FALSE;
+        g_free(filename);
         return 1;
     }
-
+    g_free(filename);
     return 0;
 }
 
diff -r c4b97a9c1f6b -r bcd729411d7c src/statusicon/si_ui.c
--- a/src/statusicon/si_ui.c	Tue Nov 13 05:11:47 2007 +0900
+++ b/src/statusicon/si_ui.c	Tue Nov 13 05:13:44 2007 +0900
@@ -499,7 +499,7 @@
     g_object_set_data( G_OBJECT(si_evbox) , "popup_active" , GINT_TO_POINTER(0) );
     g_object_set_data( G_OBJECT(si_evbox) , "popup" , si_popup );
 
-    g_signal_connect( G_OBJECT(si_evbox) , "button-press-event" ,
+    g_signal_connect( G_OBJECT(si_evbox) , "button-release-event" ,
                       G_CALLBACK(si_ui_statusicon_cb_btpress) , NULL );
     g_signal_connect( G_OBJECT(si_evbox) , "scroll-event" ,
                       G_CALLBACK(si_ui_statusicon_cb_btscroll) , NULL );