libempathy_headers = \
action-chain-internal.h \
empathy-auth-factory.h \
+ empathy-bus-names.h \
empathy-chatroom-manager.h \
empathy-chatroom.h \
empathy-client-factory.h \
--- /dev/null
+/*
+ * empathy-bus-names.h
+ *
+ * Copyright (C) 2014 Collabora Ltd. <http://www.collabora.co.uk/>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __EMPATHY_BUS_NAMES_H__
+#define __EMPATHY_BUS_NAMES_H__
+
+#define EMPATHY_BUS_NAME "org.gnome.Empathy"
+#define EMPATHY_CALL_BUS_NAME "org.gnome.Empathy.Call"
+#define EMPATHY_CHAT_BUS_NAME "org.gnome.Empathy.Chat"
+#define EMPATHY_DEBUGGER_BUS_NAME "org.gnome.Empathy.Debugger"
+#define EMPATHY_ACCOUNTS_BUS_NAME "org.gnome.EmpathyAccounts"
+
+#endif /* #ifndef __EMPATHY_BUS_NAMES_H__*/
#endif
#include "empathy-accounts-common.h"
+#include "empathy-bus-names.h"
#include "empathy-ui-utils.h"
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
#include "empathy-debug.h"
-#define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts"
-
static gboolean only_if_needed = FALSE;
static gboolean hidden = FALSE;
static gchar *selected_account_name = NULL;
gdk_set_program_class ("Empathy");
gtk_window_set_default_icon_name ("empathy");
- app = gtk_application_new (EMPATHY_ACCOUNTS_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+ app = gtk_application_new (EMPATHY_ACCOUNTS_BUS_NAME, G_APPLICATION_FLAGS_NONE);
app_class = G_OBJECT_GET_CLASS (app);
G_APPLICATION_CLASS (app_class)->local_command_line = local_cmdline;
G_APPLICATION_CLASS (app_class)->activate = app_activate;
#include <X11/Xlib.h>
#endif
+#include "empathy-bus-names.h"
#include "empathy-call-factory.h"
#include "empathy-call-window.h"
#include "empathy-ui-utils.h"
/* Exit after $TIMEOUT seconds if not displaying any call window */
#define TIMEOUT 60
-#define EMPATHY_CALL_DBUS_NAME "org.gnome.Empathy.Call"
-
static GtkApplication *app = NULL;
static gboolean activated = FALSE;
static gboolean use_timer = TRUE;
g_object_set (G_OBJECT (gtk_settings), "gtk-application-prefer-dark-theme",
TRUE, NULL);
- app = gtk_application_new (EMPATHY_CALL_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+ app = gtk_application_new (EMPATHY_CALL_BUS_NAME, G_APPLICATION_FLAGS_NONE);
g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
#ifdef ENABLE_DEBUG
#include <glib/gi18n.h>
#include <libnotify/notify.h>
+#include "empathy-bus-names.h"
#include "empathy-chat-manager.h"
#include "empathy-chat-resources.h"
#include "empathy-presence-manager.h"
/* Exit after $TIMEOUT seconds if not displaying any call window */
#define TIMEOUT 60
-#define EMPATHY_CHAT_DBUS_NAME "org.gnome.Empathy.Chat"
-
static GtkApplication *app = NULL;
static gboolean activated = FALSE;
static gboolean use_timer = TRUE;
resource = empathy_chat_get_resource ();
g_resources_register (resource);
- app = gtk_application_new (EMPATHY_CHAT_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+ app = gtk_application_new (EMPATHY_CHAT_BUS_NAME, G_APPLICATION_FLAGS_NONE);
g_signal_connect (app, "activate", G_CALLBACK (activate_cb), NULL);
#ifdef ENABLE_DEBUG
#include <glib/gi18n.h>
+#include "empathy-bus-names.h"
#include "empathy-debug-window.h"
#include "empathy-ui-utils.h"
-#define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger"
-
static GtkWidget *window = NULL;
static gchar *service = NULL;
textdomain (GETTEXT_PACKAGE);
- app = gtk_application_new (EMPATHY_DEBUGGER_DBUS_NAME, G_APPLICATION_FLAGS_NONE);
+ app = gtk_application_new (EMPATHY_DEBUGGER_BUS_NAME, G_APPLICATION_FLAGS_NONE);
app_class = G_APPLICATION_CLASS (G_OBJECT_GET_CLASS (app));
app_class->local_command_line = local_cmdline;
app_class->activate = app_activate;
#include "empathy-accounts-common.h"
#include "empathy-accounts-dialog.h"
+#include "empathy-bus-names.h"
#include "empathy-chatroom-manager.h"
#include "empathy-client-factory.h"
#include "empathy-connection-aggregator.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
-#define EMPATHY_DBUS_NAME "org.gnome.Empathy"
-
#define EMPATHY_TYPE_APP (empathy_app_get_type ())
#define EMPATHY_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_APP, EmpathyApp))
#define EMPATHY_APP_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), EMPATHY_TYPE_APP, EmpathyAppClass))
add_empathy_features ();
app = g_object_new (EMPATHY_TYPE_APP,
- "application-id", EMPATHY_DBUS_NAME,
+ "application-id", EMPATHY_BUS_NAME,
NULL);
retval = g_application_run (G_APPLICATION (app), argc, argv);