From 054c0881696a85f537e93b4950a28f505a3dc0f7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 24 Sep 2009 18:04:36 -0400 Subject: =?UTF-8?q?Bug=C2=A0589153=20-=20Use=20GtkBuilder=20instead=20of?= =?UTF-8?q?=20libglade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shell/Makefile.am | 6 ++---- shell/e-shell-view.c | 3 ++- shell/e-shell-window-actions.c | 2 +- shell/main.c | 2 -- 4 files changed, 5 insertions(+), 8 deletions(-) (limited to 'shell') diff --git a/shell/Makefile.am b/shell/Makefile.am index 608ecd314d..13ab041122 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -45,11 +45,10 @@ libeshell_la_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \ -DEVOLUTION_MODULEDIR=\""$(moduledir)"\" \ -DEVOLUTION_RULEDIR=\""$(privdatadir)"\" \ - -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DPREFIX=\""$(prefix)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ @@ -111,11 +110,10 @@ evolution_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \ -DEVOLUTION_MODULEDIR=\""$(moduledir)"\" \ -DEVOLUTION_RULEDIR=\""$(privdatadir)"\" \ - -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DPREFIX=\""$(prefix)"\" \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 1197623b71..03dac3bd7d 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -438,7 +438,8 @@ shell_view_toggled (EShellView *shell_view) id = shell_view_class->ui_manager_id; if (view_is_active && priv->merge_id == 0) { - priv->merge_id = e_load_ui_definition (ui_manager, basename); + priv->merge_id = e_load_ui_manager_definition ( + ui_manager, basename); e_plugin_ui_enable_manager (ui_manager, id); } else if (!view_is_active && priv->merge_id != 0) { diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 46cb321248..1ba9a194da 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -1874,7 +1874,7 @@ e_shell_window_actions_init (EShellWindow *shell_window) ui_manager = e_shell_window_get_ui_manager (shell_window); - e_load_ui_definition (ui_manager, "evolution-shell.ui"); + e_load_ui_manager_definition (ui_manager, "evolution-shell.ui"); /* Shell Actions */ action_group = ACTION_GROUP (SHELL); diff --git a/shell/main.c b/shell/main.c index 42b1fbcf11..2ef93d1247 100644 --- a/shell/main.c +++ b/shell/main.c @@ -37,7 +37,6 @@ #include #endif -#include #include #include @@ -575,7 +574,6 @@ main (gint argc, gchar **argv) g_warning ("Could not set up debugging output file."); } - glade_init (); e_icon_factory_init (); e_passwords_init (); -- cgit v1.2.3