[nautilus-actions] Fix nact_assistant_import_create_duplicates_treeview_model()
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Fix nact_assistant_import_create_duplicates_treeview_model()
- Date: Thu, 22 Dec 2011 00:06:58 +0000 (UTC)
commit 46ea3bc4ba5f4d53a60718d8e2200a8d0cf857d5
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Dec 19 21:41:43 2011 +0100
Fix nact_assistant_import_create_duplicates_treeview_model()
Only tries to create the model if dispose() has not run.
src/nact/nact-assistant-import.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index 858f04a..e0539be 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -363,9 +363,9 @@ on_base_initialize_gtk( NactAssistantImport *dialog )
container = find_widget_from_page( page, "p4-l4-vbox1" );
g_object_set( G_OBJECT( container ), "border-width", width, NULL );
#endif
- }
- create_duplicates_treeview_model( dialog );
+ create_duplicates_treeview_model( dialog );
+ }
}
static void
@@ -377,10 +377,9 @@ create_duplicates_treeview_model( NactAssistantImport *dialog )
GtkTreeSelection *selection;
g_return_if_fail( NACT_IS_ASSISTANT_IMPORT( dialog ));
+ g_return_if_fail( !dialog->private->dispose_has_run );
- if( !dialog->private->dispose_has_run ){
- g_debug( "%s: dialog=%p", thisfn, ( void * ) dialog );
- }
+ g_debug( "%s: dialog=%p", thisfn, ( void * ) dialog );
dialog->private->duplicates_listview = get_duplicates_treeview_from_assistant_import( dialog );
g_return_if_fail( GTK_IS_TREE_VIEW( dialog->private->duplicates_listview ));
@@ -604,7 +603,6 @@ populate_duplicates_treeview( NactAssistantImport *window )
GtkTreeIter iter;
guint i;
gchar *image_file;
-
gint width, height;
GdkPixbuf *pixbuf;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]