Init stock items before creating the toolbar (closes #2809324).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3882 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2009-06-20 16:53:28 +00:00
parent 2b49ec41c4
commit 8d18b3c2fa
4 changed files with 7 additions and 3 deletions

View File

@ -23,6 +23,8 @@
to easily expand and collapse all groups. to easily expand and collapse all groups.
Refactor the keybindings code for the preferences dialog, prefix all Refactor the keybindings code for the preferences dialog, prefix all
related functions. 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> 2009-06-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>

View File

@ -244,6 +244,8 @@ static void main_init(void)
ui_prefs.recent_projects_queue = g_queue_new(); ui_prefs.recent_projects_queue = g_queue_new();
main_status.opening_session_files = FALSE; main_status.opening_session_files = FALSE;
ui_init_stock_items();
main_widgets.window = create_window1(); main_widgets.window = create_window1();
/* add recent projects to the Project menu */ /* add recent projects to the Project menu */

View File

@ -1774,7 +1774,7 @@ static void create_config_files_menu(void)
} }
static void add_stock_items(void) void ui_init_stock_items(void)
{ {
GtkIconSet *icon_set; GtkIconSet *icon_set;
GtkIconFactory *factory = gtk_icon_factory_new(); GtkIconFactory *factory = gtk_icon_factory_new();
@ -1833,8 +1833,6 @@ static void init_recent_files(void)
void ui_init(void) void ui_init(void)
{ {
add_stock_items();
init_recent_files(); init_recent_files();
ui_widgets.statusbar = ui_lookup_widget(main_widgets.window, "statusbar"); ui_widgets.statusbar = ui_lookup_widget(main_widgets.window, "statusbar");

View File

@ -205,6 +205,8 @@ void ui_init(void);
void ui_init_toolbar_widgets(void); 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, void ui_add_config_file_menu_item(const gchar *real_path, const gchar *label,
GtkContainer *parent); GtkContainer *parent);