SF.net SVN: geany: [509] trunk

[eht16 at users.sourceforge.net]

Revision: 509
Author:   eht16
Date:     2006-06-30 05:56:09 -0700 (Fri, 30 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=509&view=rev

Log Message:
-----------
Finally fixed the second call of the switch_page callback.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/callbacks.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-06-29 23:51:32 UTC (rev 508)
+++ trunk/ChangeLog	2006-06-30 12:56:09 UTC (rev 509)
@@ -4,6 +4,8 @@
    Change the path in the VTE widget when switching between files
    according to the path of the current file.
    Process the switch_page callback only once.
+ * src/callbacks.c: Finally fixed the second call of the switch_page
+                    callback.
 
 
 2006-06-29  Nick Treleaven  <nick.treleaven at btinternet.com>

Modified: trunk/src/callbacks.c
===================================================================
--- trunk/src/callbacks.c	2006-06-29 23:51:32 UTC (rev 508)
+++ trunk/src/callbacks.c	2006-06-30 12:56:09 UTC (rev 509)
@@ -709,14 +709,7 @@
                                         gpointer         user_data)
 {
 	gint idx;
-	static gboolean state = FALSE;
 
-	// this function is called two times when switching notebook pages, I really don't know why
-	// so, skip one call (workaround)
-	state= ! state;
-	if (state) return;
-
-
 	if (closing_all) return;
 
 	// guint == -1 seems useless, but it isn't!
@@ -758,13 +751,7 @@
                                         gpointer         user_data)
 {
 	gint idx;
-	static gboolean state = FALSE;
 
-	// this function is called two times when switching notebook pages, I really don't know why
-	// so, skip one call (workaround)
-	state= ! state;
-	if (state) return;
-
 	if (closing_all) return;
 
 	// guint == -1 seems useless, but it isn't!
@@ -1156,7 +1143,8 @@
 	GtkTreeModel *model;
 	gint idx = 0;
 
-	if (gtk_tree_selection_get_selected(selection, &model, &iter))
+	// use switch_notebook_page to ignore changing the notebook page because it is already done
+	if (gtk_tree_selection_get_selected(selection, &model, &iter) && ! switch_notebook_page)
 	{
 		gtk_tree_model_get(model, &iter, 1, &idx, -1);
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook),


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