[evolution/wip-webkit2] Fix dbus service names in web-extensions
- From: Tomas Popela <tpopela src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip-webkit2] Fix dbus service names in web-extensions
- Date: Fri, 8 Nov 2013 13:51:09 +0000 (UTC)
commit 11c8386ac683f2d803573d3f5ed49eb51dadc57d
Author: Tomas Popela <tpopela redhat com>
Date: Fri Nov 8 14:15:29 2013 +0100
Fix dbus service names in web-extensions
e-util/e-web-view.c | 8 ++------
modules/itip-formatter/itip-view.c | 7 +------
.../module-itip-formatter-web-extension.c | 12 +-----------
modules/mail/e-mail-shell-view-private.c | 7 +------
.../mail/web-extension/module-mail-web-extension.c | 12 +-----------
.../e-mail-display-popup-prefer-plain.c | 7 +------
.../module-prefer-plain-web-extension.c | 12 +-----------
.../e-mail-display-popup-text-highlight.c | 7 +------
.../module-text-highlight-web-extension.c | 12 +-----------
web-extensions/evolution-web-extension.c | 12 +-----------
10 files changed, 11 insertions(+), 85 deletions(-)
---
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
index affee34..3520c73 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -1205,19 +1205,15 @@ web_extension_vanished_cb (GDBusConnection *connection,
static void
web_view_watch_web_extension (EWebView *web_view)
{
- char *service_name;
-
- service_name = g_strdup_printf ("%s-%u", EVOLUTION_WEB_EXTENSION_SERVICE_NAME, getpid ());
+ g_warning ("%s", __FUNCTION__);
web_view->priv->web_extension_watch_name_id =
g_bus_watch_name (
G_BUS_TYPE_SESSION,
- service_name,
+ EVOLUTION_WEB_EXTENSION_SERVICE_NAME,
G_BUS_NAME_WATCHER_FLAGS_NONE,
(GBusNameAppearedCallback) web_extension_appeared_cb,
(GBusNameVanishedCallback) web_extension_vanished_cb,
web_view, NULL);
-
- g_free (service_name);
}
GDBusProxy *
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index 30bc520..c038d2a 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -1899,19 +1899,14 @@ web_extension_vanished_cb (GDBusConnection *connection,
static void
itip_view_watch_web_extension (ItipView *view)
{
- char *service_name;
-
- service_name = g_strdup_printf ("%s-%u", MODULE_ITIP_FORMATTER_WEB_EXTENSION_SERVICE_NAME, getpid ());
view->priv->web_extension_watch_name_id =
g_bus_watch_name (
G_BUS_TYPE_SESSION,
- service_name,
+ MODULE_ITIP_FORMATTER_WEB_EXTENSION_SERVICE_NAME,
G_BUS_NAME_WATCHER_FLAGS_NONE,
(GBusNameAppearedCallback) web_extension_appeared_cb,
(GBusNameVanishedCallback) web_extension_vanished_cb,
view, NULL);
-
- g_free (service_name);
}
GDBusProxy *
diff --git a/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c
b/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c
index 6bd2b3b..d173c83 100644
--- a/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c
+++ b/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c
@@ -607,22 +607,12 @@ G_MODULE_EXPORT void webkit_web_extension_initialize (WebKitWebExtension *extens
G_MODULE_EXPORT void
webkit_web_extension_initialize (WebKitWebExtension *extension)
{
- char *service_name;
-
- service_name =
- g_strdup_printf (
- "%s-%s",
- MODULE_ITIP_FORMATTER_WEB_EXTENSION_SERVICE_NAME,
- g_getenv ("MODULE_ITIP_FORMATTER_WEB_EXTENSION_ID"));
-
g_bus_own_name (
G_BUS_TYPE_SESSION,
- service_name,
+ MODULE_ITIP_FORMATTER_WEB_EXTENSION_SERVICE_NAME,
G_BUS_NAME_OWNER_FLAGS_NONE,
bus_acquired_cb,
NULL, NULL,
g_object_ref (extension),
g_object_unref);
-
- g_free (service_name);
}
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index fef6be6..2a6e6be 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -635,19 +635,14 @@ web_extension_vanished_cb (GDBusConnection *connection,
static void
mail_shell_view_watch_web_extension (EMailShellView *mail_shell_view)
{
- char *service_name;
-
- service_name = g_strdup_printf ("%s-%u", MODULE_MAIL_WEB_EXTENSION_SERVICE_NAME, getpid ());
mail_shell_view->priv->web_extension_watch_name_id =
g_bus_watch_name (
G_BUS_TYPE_SESSION,
- service_name,
+ MODULE_MAIL_WEB_EXTENSION_SERVICE_NAME,
G_BUS_NAME_WATCHER_FLAGS_NONE,
(GBusNameAppearedCallback) web_extension_appeared_cb,
(GBusNameVanishedCallback) web_extension_vanished_cb,
mail_shell_view, NULL);
-
- g_free (service_name);
}
GDBusProxy *
diff --git a/modules/mail/web-extension/module-mail-web-extension.c
b/modules/mail/web-extension/module-mail-web-extension.c
index 11fb78c..2ba53d3 100644
--- a/modules/mail/web-extension/module-mail-web-extension.c
+++ b/modules/mail/web-extension/module-mail-web-extension.c
@@ -132,22 +132,12 @@ G_MODULE_EXPORT void webkit_web_extension_initialize (WebKitWebExtension *extens
G_MODULE_EXPORT void
webkit_web_extension_initialize (WebKitWebExtension *extension)
{
- char *service_name;
-
- service_name =
- g_strdup_printf (
- "%s-%s",
- MODULE_MAIL_WEB_EXTENSION_SERVICE_NAME,
- g_getenv ("MODULE_MAIL_WEB_EXTENSION_ID"));
-
g_bus_own_name (
G_BUS_TYPE_SESSION,
- service_name,
+ MODULE_MAIL_WEB_EXTENSION_SERVICE_NAME,
G_BUS_NAME_OWNER_FLAGS_NONE,
bus_acquired_cb,
NULL, NULL,
g_object_ref (extension),
g_object_unref);
-
- g_free (service_name);
}
diff --git a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
index c8ebc60..1b53e71 100644
--- a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
+++ b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
@@ -138,19 +138,14 @@ web_extension_vanished_cb (GDBusConnection *connection,
static void
mail_display_popup_prefer_plain_watch_web_extension (EMailDisplayPopupPreferPlain *pp_extension)
{
- char *service_name;
-
- service_name = g_strdup_printf ("%s-%u", MODULE_PREFER_PLAIN_WEB_EXTENSION_SERVICE_NAME, getpid ());
pp_extension->web_extension_watch_name_id =
g_bus_watch_name (
G_BUS_TYPE_SESSION,
- service_name,
+ MODULE_PREFER_PLAIN_WEB_EXTENSION_SERVICE_NAME,
G_BUS_NAME_WATCHER_FLAGS_NONE,
(GBusNameAppearedCallback) web_extension_appeared_cb,
(GBusNameVanishedCallback) web_extension_vanished_cb,
pp_extension, NULL);
-
- g_free (service_name);
}
static void
diff --git a/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c
b/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c
index 68c2b10..402f66d 100644
--- a/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c
+++ b/modules/prefer-plain/web-extension/module-prefer-plain-web-extension.c
@@ -166,22 +166,12 @@ G_MODULE_EXPORT void webkit_web_extension_initialize (WebKitWebExtension *extens
G_MODULE_EXPORT void
webkit_web_extension_initialize (WebKitWebExtension *extension)
{
- char *service_name;
-
- service_name =
- g_strdup_printf (
- "%s-%s",
- MODULE_PREFER_PLAIN_WEB_EXTENSION_SERVICE_NAME,
- g_getenv ("MODULE_PREFER_PLAIN_WEB_EXTENSION_ID"));
-
g_bus_own_name (
G_BUS_TYPE_SESSION,
- service_name,
+ MODULE_PREFER_PLAIN_WEB_EXTENSION_SERVICE_NAME,
G_BUS_NAME_OWNER_FLAGS_NONE,
bus_acquired_cb,
NULL, NULL,
g_object_ref (extension),
g_object_unref);
-
- g_free (service_name);
}
diff --git a/modules/text-highlight/e-mail-display-popup-text-highlight.c
b/modules/text-highlight/e-mail-display-popup-text-highlight.c
index 3de17d9..98536ea 100644
--- a/modules/text-highlight/e-mail-display-popup-text-highlight.c
+++ b/modules/text-highlight/e-mail-display-popup-text-highlight.c
@@ -155,19 +155,14 @@ web_extension_vanished_cb (GDBusConnection *connection,
static void
mail_display_popup_prefer_plain_watch_web_extension (EMailDisplayPopupTextHighlight *th_extension)
{
- char *service_name;
-
- service_name = g_strdup_printf ("%s-%u", MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_SERVICE_NAME, getpid ());
th_extension->web_extension_watch_name_id =
g_bus_watch_name (
G_BUS_TYPE_SESSION,
- service_name,
+ MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_SERVICE_NAME,
G_BUS_NAME_WATCHER_FLAGS_NONE,
(GBusNameAppearedCallback) web_extension_appeared_cb,
(GBusNameVanishedCallback) web_extension_vanished_cb,
th_extension, NULL);
-
- g_free (service_name);
}
static void
diff --git a/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
b/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
index 018295f..204bac2 100644
--- a/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
+++ b/modules/text-highlight/web-extension/module-text-highlight-web-extension.c
@@ -166,22 +166,12 @@ G_MODULE_EXPORT void webkit_web_extension_initialize (WebKitWebExtension *extens
G_MODULE_EXPORT void
webkit_web_extension_initialize (WebKitWebExtension *extension)
{
- char *service_name;
-
- service_name =
- g_strdup_printf (
- "%s-%s",
- MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_SERVICE_NAME,
- g_getenv ("MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_ID"));
-
g_bus_own_name (
G_BUS_TYPE_SESSION,
- service_name,
+ MODULE_TEXT_HIGHLIGHT_WEB_EXTENSION_SERVICE_NAME,
G_BUS_NAME_OWNER_FLAGS_NONE,
bus_acquired_cb,
NULL, NULL,
g_object_ref (extension),
g_object_unref);
-
- g_free (service_name);
}
diff --git a/web-extensions/evolution-web-extension.c b/web-extensions/evolution-web-extension.c
index 3c633f6..694a3f7 100644
--- a/web-extensions/evolution-web-extension.c
+++ b/web-extensions/evolution-web-extension.c
@@ -431,27 +431,17 @@ G_MODULE_EXPORT void webkit_web_extension_initialize (WebKitWebExtension *extens
G_MODULE_EXPORT void
webkit_web_extension_initialize (WebKitWebExtension *extension)
{
- char *service_name;
-
g_signal_connect (
extension, "page-created",
G_CALLBACK (web_page_created_callback),
NULL);
- service_name =
- g_strdup_printf (
- "%s-%s",
- EVOLUTION_WEB_EXTENSION_SERVICE_NAME,
- g_getenv ("EVOLUTION_WEB_EXTENSION_ID"));
-
g_bus_own_name (
G_BUS_TYPE_SESSION,
- service_name,
+ EVOLUTION_WEB_EXTENSION_SERVICE_NAME,
G_BUS_NAME_OWNER_FLAGS_NONE,
bus_acquired_cb,
NULL, NULL,
g_object_ref (extension),
g_object_unref);
-
- g_free (service_name);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]