#include <glib/gstdio.h>
#include <glib/gi18n.h>
#include <libnotify/notify.h>
+#include <tp-account-widgets/tpaw-utils.h>
#ifdef HAVE_LIBCHAMPLAIN
#include <clutter-gtk/clutter-gtk.h>
#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))
"<Primary>h",
"win." EMPATHY_PREFS_UI_SHOW_OFFLINE,
NULL);
+ gtk_application_add_accelerator (GTK_APPLICATION (app),
+ "<Control>Page_Up", "win.tab_prev", NULL);
+ gtk_application_add_accelerator (GTK_APPLICATION (app),
+ "<Control>Page_Down", "win.tab_next", NULL);
/* check if Shell is running */
dbus = tp_dbus_daemon_dup (&error);
else
{
if (!self->start_hidden)
- empathy_window_present (GTK_WINDOW (self->window));
+ tpaw_window_present (GTK_WINDOW (self->window));
}
/* Display the accounts dialog if needed */
if (!g_application_register (app, NULL, &error))
{
- g_warning("Impossible to register empathy: %s", error->message);
+ g_warning ("Impossible to register empathy: %s", error->message);
g_clear_error (&error);
*exit_status = EXIT_FAILURE;
return retval;
add_empathy_features ();
app = g_object_new (EMPATHY_TYPE_APP,
- "application-id", EMPATHY_DBUS_NAME,
+ "application-id", EMPATHY_CHAT_BUS_NAME,
NULL);
retval = g_application_run (G_APPLICATION (app), argc, argv);