Revision: 3882 http://geany.svn.sourceforge.net/geany/?rev=3882&view=rev Author: eht16 Date: 2009-06-20 16:53:28 +0000 (Sat, 20 Jun 2009)
Log Message: ----------- Init stock items before creating the toolbar (closes #2809324).
Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c trunk/src/ui_utils.c trunk/src/ui_utils.h
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-06-20 16:53:12 UTC (rev 3881) +++ trunk/ChangeLog 2009-06-20 16:53:28 UTC (rev 3882) @@ -23,6 +23,8 @@ to easily expand and collapse all groups. Refactor the keybindings code for the preferences dialog, prefix all related functions. + * src/main.c, src/ui_utils.c, src/ui_utils.h: + Init stock items before creating the toolbar (closes #2809324).
2009-06-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2009-06-20 16:53:12 UTC (rev 3881) +++ trunk/src/main.c 2009-06-20 16:53:28 UTC (rev 3882) @@ -244,6 +244,8 @@ ui_prefs.recent_projects_queue = g_queue_new(); main_status.opening_session_files = FALSE;
+ ui_init_stock_items(); + main_widgets.window = create_window1();
/* add recent projects to the Project menu */
Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2009-06-20 16:53:12 UTC (rev 3881) +++ trunk/src/ui_utils.c 2009-06-20 16:53:28 UTC (rev 3882) @@ -1774,7 +1774,7 @@ }
-static void add_stock_items(void) +void ui_init_stock_items(void) { GtkIconSet *icon_set; GtkIconFactory *factory = gtk_icon_factory_new(); @@ -1833,8 +1833,6 @@
void ui_init(void) { - add_stock_items(); - init_recent_files();
ui_widgets.statusbar = ui_lookup_widget(main_widgets.window, "statusbar");
Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2009-06-20 16:53:12 UTC (rev 3881) +++ trunk/src/ui_utils.h 2009-06-20 16:53:28 UTC (rev 3882) @@ -205,6 +205,8 @@
void ui_init_toolbar_widgets(void);
+void ui_init_stock_items(void); + void ui_add_config_file_menu_item(const gchar *real_path, const gchar *label, GtkContainer *parent);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.