SF.net SVN: geany-plugins:[1237] trunk/geany-plugins/treebrowser/src/ treebrowser.c

[dimitrov-adrian at users.sourceforge.net]

Revision: 1237
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1237&view=rev
Author:   dimitrov-adrian
Date:     2010-04-11 15:23:12 +0000 (Sun, 11 Apr 2010)

Log Message:
-----------
Treebrowser: compiler errors

Modified Paths:
--------------
    trunk/geany-plugins/treebrowser/src/treebrowser.c

Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c
===================================================================
--- trunk/geany-plugins/treebrowser/src/treebrowser.c	2010-04-11 14:01:58 UTC (rev 1236)
+++ trunk/geany-plugins/treebrowser/src/treebrowser.c	2010-04-11 15:23:12 UTC (rev 1237)
@@ -201,7 +201,7 @@
 
 	directory = g_strconcat(directory, G_DIR_SEPARATOR_S, NULL);
 
-	if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent)))
+	if (parent != NULL && gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent)))
 		expanded = TRUE;
 
 	gtk_tree_store_iter_clear_nodes(parent, FALSE);
@@ -680,7 +680,10 @@
 	item = gtk_separator_menu_item_new();
 	gtk_container_add(GTK_CONTAINER(menu), item);
 
+	/*
+	 * this is no more needen, when is initialized from create_sidebar()
 	menu_showbars = gtk_check_menu_item_new_with_mnemonic(_("Show bars"));
+	*/
 	gtk_container_add(GTK_CONTAINER(menu), menu_showbars);
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_showbars), CONFIG_SHOW_BARS);
 	g_signal_connect(menu_showbars, "activate", G_CALLBACK(on_menu_show_bars), NULL);
@@ -921,6 +924,9 @@
 	GtkWidget 			*wid;
 	GtkTreeSelection 	*selection;
 
+
+	menu_showbars = gtk_check_menu_item_new_with_mnemonic(_("Show bars"));
+
 	sidebar_vbox 		= gtk_vbox_new(FALSE, 0);
 	sidebar_vbox_bars 	= gtk_vbox_new(FALSE, 0);
 
@@ -969,7 +975,7 @@
 	g_signal_connect(wid, "clicked", G_CALLBACK(on_button_hide_bars), NULL);
 	gtk_container_add(GTK_CONTAINER(toolbar), wid);
 
-	gtk_container_add(GTK_CONTAINER(scrollwin), 	treeview);
+	gtk_container_add(GTK_CONTAINER(scrollwin), 			treeview);
 	gtk_box_pack_start(GTK_BOX(sidebar_vbox_bars), 			filter, 			FALSE, TRUE,  1);
 	gtk_box_pack_start(GTK_BOX(sidebar_vbox_bars), 			addressbar, 		FALSE, TRUE,  1);
 	gtk_box_pack_start(GTK_BOX(sidebar_vbox_bars), 			toolbar, 			FALSE, TRUE,  1);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.