SF.net SVN: geany: [1022] trunk

[eht16 at users.sourceforge.net]

Revision: 1022
          http://svn.sourceforge.net/geany/?rev=1022&view=rev
Author:   eht16
Date:     2006-11-23 07:04:10 -0800 (Thu, 23 Nov 2006)

Log Message:
-----------
Fixed segfault when opening the preferences dialog for the first time from the VTE widget.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/vte.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-11-23 12:23:36 UTC (rev 1021)
+++ trunk/ChangeLog	2006-11-23 15:04:10 UTC (rev 1022)
@@ -1,3 +1,9 @@
+2006-11-23  Enrico Tröger  <enrico.troeger at uvena.de>
+
+ * src/vte.c: Fixed segfault when opening the preferences dialog for
+              the first time from the VTE widget.
+
+
 2006-11-23  Nick Treleaven  <nick.treleaven at btinternet.com>
 
  * src/highlighting.c, src/geany.h, doc/geany.docbook,
@@ -12,7 +18,7 @@
 2006-11-22  Frank Lanitz  <frank at frank.uvena.de>
 
  * po/hu.po, src/about.c, THANKS, configure.in:
-   Added Hungarian translation (Thanks to Gabor Kmetyko aka 
+   Added Hungarian translation (Thanks to Gabor Kmetyko aka
    kilo <kg_kilo at freemail.hu>).
 
 

Modified: trunk/src/vte.c
===================================================================
--- trunk/src/vte.c	2006-11-23 12:23:36 UTC (rev 1021)
+++ trunk/src/vte.c	2006-11-23 15:04:10 UTC (rev 1022)
@@ -31,7 +31,7 @@
 #include "vte.h"
 #include "msgwindow.h"
 #include "support.h"
-#include "callbacks.h"
+#include "prefs.h"
 
 
 VteInfo vte_info;
@@ -328,10 +328,12 @@
 		}
 		case 2:
 		{
-			GtkWidget *notebook =
-				lookup_widget(app->prefs_dialog, "notebook2");
+			GtkWidget *notebook;
 
-			on_preferences1_activate(menuitem, NULL);
+			dialogs_show_prefs_dialog();
+
+			notebook = lookup_widget(app->prefs_dialog, "notebook2");
+
 			gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook),
 				gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)) - 1);
 			break;


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