GNOME.org
 

[evolution] Remove EUIManager.

commit 0494d4c3c67403293c496d0ab6ce498b954a8a06
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Mar 31 09:58:52 2013 -0400

    Remove EUIManager.
    
    No longer needed.  Use GtkUIManager directly.

 calendar/gui/dialogs/comp-editor.c           |    6 +-
 calendar/gui/dialogs/event-editor.c          |    2 +-
 doc/reference/libeutil/libeutil-docs.sgml    |    1 -
 doc/reference/libeutil/libeutil-sections.txt |   22 --
 doc/reference/libeutil/libeutil.types        |    1 -
 e-util/Makefile.am                           |    2 -
 e-util/e-attachment-view.c                   |    3 +-
 e-util/e-plugin-ui.c                         |   10 +-
 e-util/e-ui-manager.c                        |  323 --------------------------
 e-util/e-ui-manager.h                        |   78 ------
 e-util/e-util.h                              |    1 -
 mail/e-mail-browser.c                        |   10 +-
 modules/mail/e-mail-shell-view.c             |    4 +-
 shell/e-shell-view.c                         |    4 +-
 shell/e-shell-window-actions.c               |    4 +-
 shell/e-shell-window-private.c               |    2 +-
 16 files changed, 17 insertions(+), 456 deletions(-)
---
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index f269cf2..77477c3 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2030,9 +2030,7 @@ comp_editor_init (CompEditor *editor)
        priv->is_group_item = FALSE;
        priv->saved = FALSE;
 
-       priv->ui_manager = e_ui_manager_new ();
-       e_ui_manager_set_express_mode (
-               E_UI_MANAGER (priv->ui_manager), express_mode);
+       priv->ui_manager = gtk_ui_manager_new ();
 
        gtk_window_add_accel_group (
                GTK_WINDOW (editor),
@@ -2142,7 +2140,7 @@ comp_editor_init (CompEditor *editor)
        action = comp_editor_get_action (editor, "save");
        gtk_action_set_sensitive (action, FALSE);
 
-       e_ui_manager_add_ui_from_string (E_UI_MANAGER (priv->ui_manager), ui, &error);
+       gtk_ui_manager_add_ui_from_string (priv->ui_manager, ui, -1, &error);
        if (error != NULL) {
                g_warning ("%s: %s", G_STRFUNC, error->message);
                g_error_free (error);
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 81517c3..16f83d1 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -559,7 +559,7 @@ event_editor_init (EventEditor *ee)
                G_N_ELEMENTS (meeting_entries), ee);
 
        ui_manager = comp_editor_get_ui_manager (editor);
-       e_ui_manager_add_ui_from_string (E_UI_MANAGER (ui_manager), ui, &error);
+       gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
 
        id = "org.gnome.evolution.event-editor";
        e_plugin_ui_register_manager (ui_manager, id, ee);
diff --git a/doc/reference/libeutil/libeutil-docs.sgml b/doc/reference/libeutil/libeutil-docs.sgml
index 701cdce..2442b43 100644
--- a/doc/reference/libeutil/libeutil-docs.sgml
+++ b/doc/reference/libeutil/libeutil-docs.sgml
@@ -266,7 +266,6 @@
     <xi:include href="xml/e-spell-entry.xml"/>
     <xi:include href="xml/e-timezone-dialog.xml"/>
     <xi:include href="xml/e-tree-model-generator.xml"/>
-    <xi:include href="xml/e-ui-manager.xml"/>
     <xi:include href="xml/e-url-entry.xml"/>
   </chapter>
 
diff --git a/doc/reference/libeutil/libeutil-sections.txt b/doc/reference/libeutil/libeutil-sections.txt
index 6300e8c..d9d75fb 100644
--- a/doc/reference/libeutil/libeutil-sections.txt
+++ b/doc/reference/libeutil/libeutil-sections.txt
@@ -4488,28 +4488,6 @@ e_xml_get_translated_utf8_string_prop_by_name
 </SECTION>
 
 <SECTION>
-<FILE>e-ui-manager</FILE>
-<TITLE>EUIManager</TITLE>
-EUIManager
-e_ui_manager_new
-e_ui_manager_get_express_mode
-e_ui_manager_set_express_mode
-e_ui_manager_add_ui_from_file
-e_ui_manager_add_ui_from_string
-<SUBSECTION Standard>
-E_UI_MANAGER
-E_IS_UI_MANAGER
-E_TYPE_UI_MANAGER
-E_UI_MANAGER_CLASS
-E_IS_UI_MANAGER_CLASS
-E_UI_MANAGER_GET_CLASS
-EUIManagerClass
-e_ui_manager_get_type
-<SUBSECTION Private>
-EUIManagerPrivate
-</SECTION>
-
-<SECTION>
 <FILE>e-url-entry</FILE>
 <TITLE>EUrlEntry</TITLE>
 EUrlEntry
diff --git a/doc/reference/libeutil/libeutil.types b/doc/reference/libeutil/libeutil.types
index f8bfae4..bd1ec8d 100644
--- a/doc/reference/libeutil/libeutil.types
+++ b/doc/reference/libeutil/libeutil.types
@@ -158,7 +158,6 @@ e_tree_model_get_type
 e_tree_selection_model_get_type
 e_tree_sorted_get_type
 e_tree_table_adapter_get_type
-e_ui_manager_get_type
 e_url_entry_get_type
 e_web_view_get_type
 e_web_view_gtkhtml_get_type
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 9fa1877..5e974f2 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -294,7 +294,6 @@ eutilinclude_HEADERS =  \
        e-tree-sorted.h \
        e-tree-table-adapter.h \
        e-tree.h \
-       e-ui-manager.h \
        e-unicode.h \
        e-url-entry.h \
        e-util-enums.h \
@@ -539,7 +538,6 @@ libeutil_la_SOURCES = \
        e-tree-sorted.c \
        e-tree-table-adapter.c \
        e-tree.c \
-       e-ui-manager.c \
        e-unicode.c \
        e-url-entry.c \
        e-util-enumtypes.c \
diff --git a/e-util/e-attachment-view.c b/e-util/e-attachment-view.c
index b1abda1..d078bd4 100644
--- a/e-util/e-attachment-view.c
+++ b/e-util/e-attachment-view.c
@@ -33,7 +33,6 @@
 #include "e-attachment-handler-sendto.h"
 #include "e-misc-utils.h"
 #include "e-selection.h"
-#include "e-ui-manager.h"
 
 enum {
        UPDATE_ACTIONS,
@@ -882,7 +881,7 @@ e_attachment_view_init (EAttachmentView *view)
 
        priv = e_attachment_view_get_private (view);
 
-       ui_manager = e_ui_manager_new ();
+       ui_manager = gtk_ui_manager_new ();
        priv->merge_id = gtk_ui_manager_new_merge_id (ui_manager);
        priv->ui_manager = ui_manager;
 
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index 3ef863c..a8d0368 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -21,8 +21,6 @@
 
 #include "e-plugin-ui.h"
 
-#include "e-ui-manager.h"
-
 #include <string.h>
 
 #define E_PLUGIN_UI_HOOK_GET_PRIVATE(obj) \
@@ -247,12 +245,8 @@ plugin_ui_hook_merge_ui (EPluginUIHook *hook,
        ui_definition = g_hash_table_lookup (hash_table, id);
        g_return_val_if_fail (ui_definition != NULL, 0);
 
-       if (E_IS_UI_MANAGER (ui_manager))
-               merge_id = e_ui_manager_add_ui_from_string (
-                       E_UI_MANAGER (ui_manager), ui_definition, &error);
-       else
-               merge_id = gtk_ui_manager_add_ui_from_string (
-                       ui_manager, ui_definition, -1, &error);
+       merge_id = gtk_ui_manager_add_ui_from_string (
+               ui_manager, ui_definition, -1, &error);
 
        if (error != NULL) {
                g_warning ("%s", error->message);
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 17c4e60..d60a6f0 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -215,7 +215,6 @@
 #include <e-util/e-tree-sorted.h>
 #include <e-util/e-tree-table-adapter.h>
 #include <e-util/e-tree.h>
-#include <e-util/e-ui-manager.h>
 #include <e-util/e-unicode.h>
 #include <e-util/e-url-entry.h>
 #include <e-util/e-util-enums.h>
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 8556fb2..19b74fc 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -553,7 +553,7 @@ mail_browser_constructed (GObject *object)
        shell_backend = E_SHELL_BACKEND (backend);
        shell = e_shell_backend_get_shell (shell_backend);
 
-       ui_manager = e_ui_manager_new ();
+       ui_manager = gtk_ui_manager_new ();
 
        browser->priv->ui_manager = ui_manager;
        domain = GETTEXT_PACKAGE;
@@ -618,12 +618,10 @@ mail_browser_constructed (GObject *object)
 
        e_mail_reader_init (reader, TRUE, TRUE);
 
-       e_ui_manager_add_ui_from_file (
-               E_UI_MANAGER (ui_manager), E_MAIL_READER_UI_DEFINITION);
-       e_ui_manager_add_ui_from_string (
-               E_UI_MANAGER (ui_manager), ui, NULL);
+       e_load_ui_manager_definition (ui_manager, E_MAIL_READER_UI_DEFINITION);
+       gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL);
 
-       merge_id = gtk_ui_manager_new_merge_id (GTK_UI_MANAGER (ui_manager));
+       merge_id = gtk_ui_manager_new_merge_id (ui_manager);
        e_mail_reader_create_charset_menu (reader, ui_manager, merge_id);
 
        accel_group = gtk_ui_manager_get_accel_group (ui_manager);
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index f739ca6..285bb5d 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -253,8 +253,8 @@ mail_shell_view_toggled (EShellView *shell_view)
        if (view_is_active && priv->merge_id == 0) {
                EMailView *mail_view;
 
-               priv->merge_id = e_ui_manager_add_ui_from_file (
-                       E_UI_MANAGER (ui_manager), basename);
+               priv->merge_id = e_load_ui_manager_definition (
+                       ui_manager, basename);
                mail_view = e_mail_shell_content_get_mail_view (
                        priv->mail_shell_content);
                e_mail_reader_create_charset_menu (
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 77597d0..2d876ff 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -719,8 +719,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_ui_manager_add_ui_from_file (
-                       E_UI_MANAGER (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) {
                e_plugin_ui_disable_manager (ui_manager, id);
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 2b70a5e..0863c1b 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -1283,8 +1283,8 @@ e_shell_window_actions_init (EShellWindow *shell_window)
        g_return_if_fail (E_IS_SHELL_WINDOW (shell_window));
 
        ui_manager = e_shell_window_get_ui_manager (shell_window);
-       e_ui_manager_add_ui_from_file (
-               E_UI_MANAGER (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/e-shell-window-private.c b/shell/e-shell-window-private.c
index 69e3ff2..b3070a6 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -220,7 +220,7 @@ e_shell_window_private_init (EShellWindow *shell_window)
 
        signal_handler_ids = g_array_new (FALSE, FALSE, sizeof (gulong));
 
-       priv->ui_manager = e_ui_manager_new ();
+       priv->ui_manager = gtk_ui_manager_new ();
        priv->loaded_views = loaded_views;
        priv->signal_handler_ids = signal_handler_ids;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]