diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2009-12-18 20:15:50 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-12-18 20:15:50 +0000 |
| commit | b75b2ae8bbeada1a364332596a759f4d0410a852 (patch) | |
| tree | 22738b6fd641b63432b211ca5f04d1cbb20ef20b /gtk/gtk_toolbar.c | |
| parent | 46eaa6a0586dfafb4d0802c1583c86a6d155eaa3 (diff) | |
| download | netsurf-b75b2ae8bbeada1a364332596a759f4d0410a852.tar.gz netsurf-b75b2ae8bbeada1a364332596a759f4d0410a852.tar.bz2 | |
Merge r9731:HEAD from branches/MarkieB/gtkmain to trunk.
svn path=/trunk/netsurf/; revision=9737
Diffstat (limited to 'gtk/gtk_toolbar.c')
| -rw-r--r-- | gtk/gtk_toolbar.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/gtk/gtk_toolbar.c b/gtk/gtk_toolbar.c index 20cfbd812..bde285d34 100644 --- a/gtk/gtk_toolbar.c +++ b/gtk/gtk_toolbar.c @@ -201,16 +201,20 @@ void nsgtk_toolbar_window_open(nsgtk_scaffolding *g) } glade_xml_signal_autoconnect(window->glade); -#define GET_TOOLWIDGET(p, q, r, s) r->p = glade_xml_get_widget(r->s, #q);\ - if (r->p == NULL) {\ - warn_user(messages_get("NoMemory"), 0);\ - nsgtk_toolbar_cancel_clicked(NULL, g);\ - return;\ - } - - GET_TOOLWIDGET(window, toolbarwindow, window, glade) - GET_TOOLWIDGET(widgetvbox, widgetvbox, window, glade) -#undef GET_TOOLWIDGET + window->window = glade_xml_get_widget(window->glade, "toolbarwindow"); + if (window->window == NULL) { + warn_user(messages_get("NoMemory"), 0); + nsgtk_toolbar_cancel_clicked(NULL, g); + free(theme); + return; + } + window->widgetvbox = glade_xml_get_widget(window->glade, "widgetvbox"); + if (window->widgetvbox == NULL) { + warn_user(messages_get("NoMemory"), 0); + nsgtk_toolbar_cancel_clicked(NULL, g); + free(theme); + return; + } window->numberh = NSGTK_STORE_WIDTH; /* preset to width [in buttons] of */ /* store to cause creation of a new toolbar */ |