diff -Nru pcmanfm-0.9.9/debian/changelog pcmanfm-0.9.9/debian/changelog --- pcmanfm-0.9.9/debian/changelog 2011-08-11 05:21:11.000000000 +0530 +++ pcmanfm-0.9.9/debian/changelog 2012-06-03 08:38:53.000000000 +0530 @@ -1,3 +1,10 @@ +pcmanfm (0.9.9-0ubuntu1.1) oneiric-proposed; urgency=low + + * debian/patches/02-102_crash_on_refresh.patch + - Fixes crash on refresh. Cherrypicked from upstream (LP: #853507) + + -- Vibhav Pant Sun, 03 Jun 2012 08:11:12 +0530 + pcmanfm (0.9.9-0ubuntu1) oneiric; urgency=low * New upstream release. diff -Nru pcmanfm-0.9.9/debian/patches/02-102_crash_on_refresh.patch pcmanfm-0.9.9/debian/patches/02-102_crash_on_refresh.patch --- pcmanfm-0.9.9/debian/patches/02-102_crash_on_refresh.patch 1970-01-01 05:30:00.000000000 +0530 +++ pcmanfm-0.9.9/debian/patches/02-102_crash_on_refresh.patch 2012-06-03 08:40:09.000000000 +0530 @@ -0,0 +1,42 @@ +Author: Vadim Ushakov 2012-03-23 07:17:11 +Commited-by: Vadim Ushakov 2012-03-23 07:17:11 +Parent: 0bf8dedcfaea74b1557dd9f369d48ec270ee7613 (Add tooltips to statusbar ( http://sourceforge.net/tracker/?func=detail&aid=3456079&group_id=156956&atid=801866 )) +Child: c668ec596a62c9530b3974f94dfc29bbf63cb889 (show totalsize of all selected files on statusbar (http://sourceforge.net/tracker/?func=detail&aid=3346479&group_id=156956&atid=801866)) +Branche: master, remotes/origin/master +Bug: Fix crash on Refresh (http://sourceforge.net/tracker/?func=detail&aid=3438580&group_id=156956&atid=801866) +Bug-Ubuntu:https://bugs.launchpad.net/ubuntu/+source/pcmanfm/+bug/853507 +--- +--- pcmanfm-0.9.9.orig/src/tab-page.c ++++ pcmanfm-0.9.9/src/tab-page.c +@@ -39,6 +39,8 @@ static void fm_tab_page_finalize(GObject *object); + static void fm_tab_page_chdir_without_history(FmTabPage* page, FmPath* path); + static void on_folder_fs_info(FmFolder* folder, FmTabPage* page); + static void on_folder_content_changed(FmFolder* folder, FmTabPage* page); ++static void on_folder_view_sel_changed(FmFolderView* fv, FmFileInfoList* files, mTabPage* page); ++static void on_folder_view_loaded(FmFolderView* view, FmPath* path, FmTabPage* age); + static char* format_status_text(FmTabPage* page); + + #if GTK_CHECK_VERSION(3, 0, 0) +@@ -124,13 +126,18 @@ inline static void disconnect_folder(FmTabPage* page, mFolder* folder) + } + + #if GTK_CHECK_VERSION(3, 0, 0) +-void fm_tab_page_destroy(GtkWidget *page) ++void fm_tab_page_destroy(GtkWidget *object) + #else +-void fm_tab_page_destroy(GtkObject *page) ++void fm_tab_page_destroy(GtkObject *object) + #endif + { +- FmFolder* folder = fm_tab_page_get_folder(FM_TAB_PAGE(page)); ++ FmTabPage* page = FM_TAB_PAGE(object); ++ FmFolder* folder = fm_tab_page_get_folder(page); ++ ++ // so we don't call these on a dead object + disconnect_folder(page, folder); ++ g_signal_handlers_disconnect_by_func(page->folder_view, n_folder_view_sel_changed, page); ++ g_signal_handlers_disconnect_by_func(page->folder_view, n_folder_view_loaded, page); + } + + static void on_folder_content_changed(FmFolder* folder, FmTabPage* page) + diff -Nru pcmanfm-0.9.9/debian/patches/series pcmanfm-0.9.9/debian/patches/series --- pcmanfm-0.9.9/debian/patches/series 2010-12-12 03:00:54.000000000 +0530 +++ pcmanfm-0.9.9/debian/patches/series 2012-06-03 08:11:03.000000000 +0530 @@ -1 +1,2 @@ 01-libfm-0.1.14-API-changes.patch +02-102_crash_on_refresh.patch