Revision: 3265 http://geany.svn.sourceforge.net/geany/?rev=3265&view=rev Author: ntrel Date: 2008-11-21 17:27:16 +0000 (Fri, 21 Nov 2008)
Log Message: ----------- Create geany_object in main.c so core functions can use it even when plugins are disabled.
Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c trunk/src/plugins.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-11-21 16:49:38 UTC (rev 3264) +++ trunk/ChangeLog 2008-11-21 17:27:16 UTC (rev 3265) @@ -18,6 +18,9 @@ Update from file made by Tyler D'Agosta (thanks). This version includes all character entities defined by HTML 2.0, HTML 3.2, and HTML 4.0, and one (') defined in XHTML 1.0. + * src/plugins.c, src/main.c: + Create geany_object in main.c so core functions can use it even + when plugins are disabled.
2008-11-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-11-21 16:49:38 UTC (rev 3264) +++ trunk/src/main.c 2008-11-21 17:27:16 UTC (rev 3265) @@ -72,6 +72,7 @@ #include "navqueue.h" #include "plugins.h" #include "printing.h" +#include "geanyobject.h"
#ifdef HAVE_SOCKET # include "socket.h" @@ -924,6 +925,9 @@ gtk_major_version, gtk_minor_version, gtk_micro_version, glib_major_version, glib_minor_version, glib_micro_version);
+ /* create the object so Geany signals can be connected in init() functions */ + geany_object = geany_object_new(); + /* inits */ main_init(); gtk_widget_set_size_request(main_widgets.window, GEANY_WINDOW_MINIMAL_WIDTH, GEANY_WINDOW_MINIMAL_HEIGHT); @@ -1124,6 +1128,9 @@ if (msgwindow.popup_compiler_menu && GTK_IS_WIDGET(msgwindow.popup_compiler_menu)) gtk_widget_destroy(msgwindow.popup_compiler_menu);
+ g_object_unref(geany_object); + geany_object = NULL; + g_free(app);
gtk_main_quit();
Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2008-11-21 16:49:38 UTC (rev 3264) +++ trunk/src/plugins.c 2008-11-21 17:27:16 UTC (rev 3265) @@ -820,7 +820,6 @@ GtkWidget *widget;
geany_data_init(); - geany_object = geany_object_new();
widget = gtk_separator_menu_item_new(); gtk_widget_show(widget); @@ -910,9 +909,6 @@ g_list_free(active_plugin_list); } g_strfreev(active_plugins_pref); - - g_object_unref(geany_object); - geany_object = NULL; /* to mark the object as invalid for any code which tries to emit signals */ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.