SF.net SVN: geany: [1175] trunk

[ntrel at users.sourceforge.net]

Revision: 1175
          http://svn.sourceforge.net/geany/?rev=1175&view=rev
Author:   ntrel
Date:     2007-01-12 05:04:39 -0800 (Fri, 12 Jan 2007)

Log Message:
-----------
Don't select the current document when reordering tabs (fixes
#1632708).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/document.c
    trunk/src/treeviews.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-01-12 12:33:17 UTC (rev 1174)
+++ trunk/ChangeLog	2007-01-12 13:04:39 UTC (rev 1175)
@@ -5,6 +5,9 @@
    syntax, and C++ .h headers use correct syntax).
    Add symbols_get_context_separator() and use for calltips and the
    symbol list.
+ * src/treeviews.c, src/document.c:
+   Don't select the current document when reordering tabs (fixes
+   #1632708).
 
 
 2007-01-11  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c	2007-01-12 12:33:17 UTC (rev 1174)
+++ trunk/src/document.c	2007-01-12 13:04:39 UTC (rev 1175)
@@ -281,9 +281,9 @@
 	sci_set_lines_wrapped(sci, app->pref_editor_line_breaking);
 
 	// signal for insert-key(works without too, but to update the right status bar)
-/*	g_signal_connect((GtkWidget*) sci, "key-press-event",
-					G_CALLBACK(keybindings_got_event), GINT_TO_POINTER(new_idx));
-*/	// signal for the popup menu
+	//g_signal_connect((GtkWidget*) sci, "key-press-event",
+					//G_CALLBACK(keybindings_got_event), GINT_TO_POINTER(new_idx));
+	// signal for the popup menu
 	g_signal_connect((GtkWidget*) sci, "button-press-event",
 					G_CALLBACK(on_editor_button_press_event), GINT_TO_POINTER(new_idx));
 
@@ -316,6 +316,14 @@
 	tabnum = notebook_new_tab(new_idx);
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), tabnum);
 
+	// select document in sidebar
+	{
+		GtkTreeSelection *sel;
+
+		sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles));
+		gtk_tree_selection_select_iter(sel, &this->iter);
+	}
+
 	ui_close_buttons_toggle();
 
 	this->is_valid = TRUE;	// do this last to prevent UI updating with NULL items.

Modified: trunk/src/treeviews.c
===================================================================
--- trunk/src/treeviews.c	2007-01-12 12:33:17 UTC (rev 1174)
+++ trunk/src/treeviews.c	2007-01-12 13:04:39 UTC (rev 1175)
@@ -325,18 +325,14 @@
 }
 
 
-// Also sets doc_list[idx].iter.
+/* Also sets doc_list[idx].iter.
+ * This is called recursively in treeviews_openfiles_update_all(). */
 void treeviews_openfiles_add(gint idx)
 {
 	GtkTreeIter *iter = &doc_list[idx].iter;
-	GtkTreeSelection *sel;
 
 	gtk_list_store_append(tv.store_openfiles, iter);
 	treeviews_openfiles_update(idx);
-
-	// select opened file
-	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles));
-	gtk_tree_selection_select_iter(sel, iter);
 }
 
 


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