Hi, all: I'd like to revise my patch again to change the variable name and the patch strip level. > =================================================================== > --- base-specs/file-roller.spec (revision 18197) > +++ base-specs/file-roller.spec (working copy) > @@ -67,7 +67,7 @@ > cd po-sun; make; cd .. > %endif > %patch1 -p1 > -%patch2 -p2 > +%patch2 -p1 > for po in po/*.po; do > dos2unix -ascii $po $po > done > $ svn diff patches/file-roller-02-add-folder.diff > Index: patches/file-roller-02-add-folder.diff > =================================================================== > --- patches/file-roller-02-add-folder.diff (revision 18197) > +++ patches/file-roller-02-add-folder.diff (working copy) > @@ -1,10 +1,10 @@ > ---- > SUNWgnome-archive-mgr-2.26.1/file-roller-2.26.1/src/dlg-add-folder.c.orig > 2009-04-23 03:00:46.000000000 +0800 > -+++ SUNWgnome-archive-mgr-2.26.1/file-roller-2.26.1/src/dlg-add-folder.c > 2009-04-24 11:56:14.701720000 +0800 > +--- file-roller-2.26.1/src/dlg-add-folder.c.orig 2009-04-23 > 03:00:46.0000 > 00000 +0800 > ++++ file-roller-2.26.1/src/dlg-add-folder.c 2009-04-24 > 11:56:14.701720000 +0 > 800 > @@ -98,6 +98,7 @@ > const char *exclude_files; > const char *exclude_folders; > char *dest_dir; > -+ char *local_filename; > ++ char *local_foldername; > > > dlg_add_folder_save_last_options (data); > @@ -12,10 +12,10 @@ > if (utf8_only_spaces (exclude_folders)) > exclude_folders = NULL; > > -+ local_filename = g_filename_from_uri (selected_folder,NULL,NULL); > ++ local_foldername = g_filename_from_uri > (selected_folder,NULL,NULL); > dest_dir = build_uri (fr_window_get_current_location (window), > - file_name_from_path (selected_folder), > -+ file_name_from_path (local_filename), > ++ file_name_from_path (local_foldername), > NULL); > > fr_window_archive_add_with_wildcard (window, > @@ -23,7 +23,7 @@ > update, > follow_links); > > -+ g_free (local_filename); > ++ g_free (local_foldername); > g_free (dest_dir); > g_free (selected_folder);
Thanks, Harry FU Ning ??: > Attached please find the revised patch. > And it is submitted to the community: > http://bugzilla.gnome.org/show_bug.cgi?id=580070 > > Best Regards, > Harry > > on 2009?04?23? 19:35, Takao Fujiwara - Tokyo S/W Center wrote: >> The returned value should be freed and it's better to upstream the >> patch. >> >> FU Ning-san wrote (04/23/09 07:11 PM): >>> Hi, all: >>> >>> Please review the patch for doo #8286(garbage displayed when adding >>> folder to file-roller). >>> >>> Best Regards, >>> Harry >>> --- >>> SUNWgnome-archive-mgr-2.26.1/file-roller-2.26.1/src/dlg-add-folder.c.orig >>> >>> 2009-04-23 03:00:46.000000000 +0800 >>> +++ >>> SUNWgnome-archive-mgr-2.26.1/file-roller-2.26.1/src/dlg-add-folder.c >>> 2009-04-23 17:55:40.095363000 +0800 >>> @@ -154,7 +154,7 @@ >>> exclude_folders = NULL; >>> >>> dest_dir = build_uri (fr_window_get_current_location (window), >>> - file_name_from_path (selected_folder), >>> + file_name_from_path >>> (g_filename_from_uri (selected_folder,NULL,NULL)), >>> NULL); >>> >>> fr_window_archive_add_with_wildcard (window, >>> >>> =================================================================== >>> --- file-roller.spec (revision 18178) >>> +++ file-roller.spec (working copy) >>> @@ -24,6 +24,8 @@ >>> %endif >>> # date:2003-07-24 type:branding owner:gman >>> Patch1: file-roller-01-menu-entry.diff >>> +# date:2009-04-23 type:bug doo #8286 owner:harry.fu at sun.com >>> +Patch2: file-roller-02-add-folder.diff >>> URL: http://www.gnome.org >>> BuildRoot: %{_tmppath}/%{name}-%{version}-build >>> Docdir: %{_defaultdocdir} >>> @@ -65,6 +67,7 @@ >>> cd po-sun; make; cd .. >>> %endif >>> %patch1 -p1 >>> +%patch2 -p2 >>> for po in po/*.po; do >>> dos2unix -ascii $po $po >>> done >>> >>> >> >
