From 9c19df4215cc73bf82049f7527cb2e85fc15d881 Mon Sep 17 00:00:00 2001 From: John Smith Date: Tue, 18 Sep 2012 14:22:47 +0900 Subject: Fix for 818628 : DBUS Metadata for error domain warning when using File>New (bzr r11674) --- src/extension/dbus/application-interface.cpp | 41 ++++++++++++++++++++++++++++ src/extension/dbus/application-interface.h | 17 ++++++++++++ src/extension/dbus/dbus-init.cpp | 3 -- src/extension/dbus/dbus-init.h | 1 + src/extension/dbus/document-interface.cpp | 37 +------------------------ src/extension/dbus/document-interface.h | 14 +--------- 6 files changed, 61 insertions(+), 52 deletions(-) (limited to 'src/extension') diff --git a/src/extension/dbus/application-interface.cpp b/src/extension/dbus/application-interface.cpp index a652b7c96..8ee7bd12f 100644 --- a/src/extension/dbus/application-interface.cpp +++ b/src/extension/dbus/application-interface.cpp @@ -39,6 +39,9 @@ application_interface_class_init (ApplicationInterfaceClass *klass) static void application_interface_init (ApplicationInterface *object) { + dbus_g_error_domain_register (INKSCAPE_ERROR, + NULL, + INKSCAPE_TYPE_ERROR); } @@ -48,6 +51,44 @@ application_interface_new (void) return (ApplicationInterface*)g_object_new (TYPE_APPLICATION_INTERFACE, NULL); } +/* + * Error stuff... + * + * To add a new error type, edit here and in the .h InkscapeError enum. + */ +GQuark +inkscape_error_quark (void) +{ + static GQuark quark = 0; + if (!quark) + quark = g_quark_from_static_string ("inkscape_error"); + + return quark; +} + +#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC } + +GType inkscape_error_get_type(void) +{ + static GType etype = 0; + + if (etype == 0) { + static const GEnumValue values[] = + { + + ENUM_ENTRY(INKSCAPE_ERROR_SELECTION, "Incompatible_Selection"), + ENUM_ENTRY(INKSCAPE_ERROR_OBJECT, "Incompatible_Object"), + ENUM_ENTRY(INKSCAPE_ERROR_VERB, "Failed_Verb"), + ENUM_ENTRY(INKSCAPE_ERROR_OTHER, "Generic_Error"), + { 0, 0, 0 } + }; + + etype = g_enum_register_static("InkscapeError", values); + } + + return etype; +} + /**************************************************************************** DESKTOP FUNCTIONS ****************************************************************************/ diff --git a/src/extension/dbus/application-interface.h b/src/extension/dbus/application-interface.h index e782bd1ad..88219a6b0 100644 --- a/src/extension/dbus/application-interface.h +++ b/src/extension/dbus/application-interface.h @@ -45,6 +45,23 @@ struct _ApplicationInterfaceClass { GObjectClass parent; }; + +typedef enum +{ + INKSCAPE_ERROR_SELECTION, + INKSCAPE_ERROR_OBJECT, + INKSCAPE_ERROR_VERB, + INKSCAPE_ERROR_OTHER +} InkscapeError; + + + +#define INKSCAPE_ERROR (inkscape_error_quark ()) +#define INKSCAPE_TYPE_ERROR (inkscape_error_get_type ()) + +GQuark inkscape_error_quark (void); +GType inkscape_error_get_type (void); + /**************************************************************************** DESKTOP FUNCTIONS ****************************************************************************/ diff --git a/src/extension/dbus/dbus-init.cpp b/src/extension/dbus/dbus-init.cpp index 1b6baa979..9ff6897e5 100644 --- a/src/extension/dbus/dbus-init.cpp +++ b/src/extension/dbus/dbus-init.cpp @@ -128,9 +128,6 @@ dbus_init_desktop_interface (SPDesktop * dt) DBusGConnection *connection; DBusGProxy *proxy; DocumentInterface *obj; - dbus_g_error_domain_register (INKSCAPE_ERROR, - NULL, - INKSCAPE_TYPE_ERROR); std::string name("/org/inkscape/desktop_"); std::stringstream out; diff --git a/src/extension/dbus/dbus-init.h b/src/extension/dbus/dbus-init.h index 4b07acfb4..025011f28 100644 --- a/src/extension/dbus/dbus-init.h +++ b/src/extension/dbus/dbus-init.h @@ -12,6 +12,7 @@ #include "desktop.h" + namespace Inkscape { namespace Extension { namespace Dbus { diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp index c67234b34..66d1c5dfa 100644 --- a/src/extension/dbus/document-interface.cpp +++ b/src/extension/dbus/document-interface.cpp @@ -17,6 +17,7 @@ #include "file.h" //IO #include "document-interface.h" +#include "application-interface.h" #include #include #include "desktop-handles.h" //sp_desktop_document() @@ -320,43 +321,7 @@ document_interface_new (void) return (DocumentInterface*)g_object_new (TYPE_DOCUMENT_INTERFACE, NULL); } -/* - * Error stuff... - * - * To add a new error type, edit here and in the .h InkscapeError enum. - */ -GQuark -inkscape_error_quark (void) -{ - static GQuark quark = 0; - if (!quark) - quark = g_quark_from_static_string ("inkscape_error"); - - return quark; -} - -#define ENUM_ENTRY(NAME, DESC) { NAME, "" #NAME "", DESC } -GType inkscape_error_get_type(void) -{ - static GType etype = 0; - - if (etype == 0) { - static const GEnumValue values[] = - { - - ENUM_ENTRY(INKSCAPE_ERROR_SELECTION, "Incompatible_Selection"), - ENUM_ENTRY(INKSCAPE_ERROR_OBJECT, "Incompatible_Object"), - ENUM_ENTRY(INKSCAPE_ERROR_VERB, "Failed_Verb"), - ENUM_ENTRY(INKSCAPE_ERROR_OTHER, "Generic_Error"), - { 0, 0, 0 } - }; - - etype = g_enum_register_static("InkscapeError", values); - } - - return etype; -} /**************************************************************************** MISC FUNCTIONS diff --git a/src/extension/dbus/document-interface.h b/src/extension/dbus/document-interface.h index e7e55cb7d..5fcbb919b 100644 --- a/src/extension/dbus/document-interface.h +++ b/src/extension/dbus/document-interface.h @@ -56,19 +56,7 @@ struct _DocumentInterfaceClass { GObjectClass parent; }; -typedef enum -{ - INKSCAPE_ERROR_SELECTION, - INKSCAPE_ERROR_OBJECT, - INKSCAPE_ERROR_VERB, - INKSCAPE_ERROR_OTHER -} InkscapeError; - -#define INKSCAPE_ERROR (inkscape_error_quark ()) -#define INKSCAPE_TYPE_ERROR (inkscape_error_get_type ()) - -GQuark inkscape_error_quark (void); -GType inkscape_error_get_type (void); + struct DBUSPoint { int x; -- cgit v1.2.3