X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2Fempathy.c;h=fa71d706640e778bc626cbbbbd7b2991778d7f0f;hp=57f5c8418329724224143a9ef36578e51dff88df;hb=15aa6a83ff96fad9f959762f2b57646f9e735cd1;hpb=bbe74c7f743b9210a905c74864a9b5d33ad48a87 diff --git a/src/empathy.c b/src/empathy.c index 57f5c841..fa71d706 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -19,65 +19,37 @@ * Authors: Xavier Claessens */ -#include +#include "config.h" -#include -#include -#include - -#include #include #include -#include -#include +#include +#include #ifdef HAVE_LIBCHAMPLAIN #include #endif -#include - -#include -#include -#include -#include -#include -#include - -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "empathy-main-window.h" #include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" -#include "empathy-status-icon.h" +#include "empathy-bus-names.h" +#include "empathy-chatroom-manager.h" +#include "empathy-client-factory.h" +#include "empathy-connection-aggregator.h" +#include "empathy-ft-factory.h" #include "empathy-ft-manager.h" +#include "empathy-gsettings.h" +#include "empathy-location-manager.h" #include "empathy-notifications-approver.h" - -#include "extensions/extensions.h" +#include "empathy-presence-manager.h" +#include "empathy-request-util.h" +#include "empathy-roster-window.h" +#include "empathy-status-icon.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include - -#define EMPATHY_DBUS_NAME "org.gnome.Empathy" +#include "empathy-debug.h" #define EMPATHY_TYPE_APP (empathy_app_get_type ()) #define EMPATHY_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EMPATHY_TYPE_APP, EmpathyApp)) @@ -121,7 +93,6 @@ struct _EmpathyApp EmpathyChatroomManager *chatroom_manager; EmpathyFTFactory *ft_factory; EmpathyPresenceManager *presence_mgr; - EmpathyConnectivity *connectivity; GSettings *gsettings; EmpathyNotificationsApprover *notifications_approver; EmpathyConnectionAggregator *conn_aggregator; @@ -159,7 +130,6 @@ empathy_app_dispose (GObject *object) #endif tp_clear_object (&self->presence_mgr); - tp_clear_object (&self->connectivity); tp_clear_object (&self->icon); tp_clear_object (&self->account_manager); tp_clear_object (&self->log_manager); @@ -241,11 +211,6 @@ new_ft_handler_cb (EmpathyFTFactory *factory, g_object_unref (handler); } -static gboolean -empathy_app_local_command_line (GApplication *app, - gchar ***arguments, - gint *exit_status); - static void empathy_presence_manager_set_auto_away_cb (GSettings *gsettings, const gchar *key, @@ -289,8 +254,8 @@ out: /* Rely on GNOME Shell to watch session state */ empathy_presence_manager_set_auto_away (self->presence_mgr, FALSE); - empathy_main_window_set_shell_running (EMPATHY_MAIN_WINDOW (self->window), - TRUE); + empathy_roster_window_set_shell_running ( + EMPATHY_ROSTER_WINDOW (self->window), TRUE); } else { @@ -312,32 +277,18 @@ out: } } -static int -empathy_app_command_line (GApplication *app, - GApplicationCommandLine *cmdline) +static void +empathy_app_activate (GApplication *app) { EmpathyApp *self = (EmpathyApp *) app; - gchar **args, **argv; - gint argc, exit_status, i; - - args = g_application_command_line_get_arguments (cmdline, &argc); - /* We have to make an extra copy of the array, since g_option_context_parse() - * assumes that it can remove strings from the array without freeing them. */ - argv = g_new (gchar*, argc + 1); - for (i = 0; i <= argc; i++) - argv[i] = args[i]; - - if (empathy_app_local_command_line (app, &argv, &exit_status)) - DEBUG ("failed to parse command line!"); - - g_free (argv); - g_strfreev (args); if (!self->activated) { GError *error = NULL; TpDBusDaemon *dbus; + empathy_gtk_init (); + /* Create the FT factory */ self->ft_factory = empathy_ft_factory_dup_singleton (); g_signal_connect (self->ft_factory, "new-ft-handler", @@ -355,10 +306,21 @@ empathy_app_command_line (GApplication *app, self->activated = TRUE; /* Setting up UI */ - self->window = empathy_main_window_dup (); + self->window = empathy_roster_window_new (GTK_APPLICATION (app)); + gtk_application_set_app_menu (GTK_APPLICATION (self), + empathy_roster_window_get_menu_model ( + EMPATHY_ROSTER_WINDOW (self->window))); gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (self->window)); + gtk_application_add_accelerator (GTK_APPLICATION (app), + "h", + "win." EMPATHY_PREFS_UI_SHOW_OFFLINE, + NULL); + gtk_application_add_accelerator (GTK_APPLICATION (app), + "Page_Up", "win.tab_prev", NULL); + gtk_application_add_accelerator (GTK_APPLICATION (app), + "Page_Down", "win.tab_next", NULL); /* check if Shell is running */ dbus = tp_dbus_daemon_dup (&error); @@ -372,26 +334,24 @@ empathy_app_command_line (GApplication *app, self->notifications_approver = empathy_notifications_approver_dup_singleton (); } - else - { - /* We're requested to show stuff again, disable the start hidden global in - * case the accounts wizard wants to pop up. - */ - self->start_hidden = FALSE; - } if (self->show_preferences) - empathy_main_window_show_preferences (EMPATHY_MAIN_WINDOW (self->window), - self->preferences_tab); + { + empathy_roster_window_show_preferences ( + EMPATHY_ROSTER_WINDOW (self->window), + tp_str_empty (self->preferences_tab) ? NULL : self->preferences_tab); - if (!self->start_hidden) - empathy_window_present (GTK_WINDOW (self->window)); + self->show_preferences = FALSE; + } + else + { + if (!self->start_hidden) + tpaw_window_present (GTK_WINDOW (self->window)); + } /* Display the accounts dialog if needed */ tp_proxy_prepare_async (self->account_manager, NULL, account_manager_ready_cb, self); - - return 0; } static gboolean @@ -416,16 +376,30 @@ show_version_cb (const char *option_name, gpointer data, GError **error); +static void +open_preference_action_cb (GAction *action, + GVariant *parameter, + gpointer data) +{ + EmpathyApp *self = EMPATHY_APP (data); + + self->show_preferences = TRUE; + + g_free (self->preferences_tab); + self->preferences_tab = g_variant_dup_string (parameter, NULL); +} + static gboolean empathy_app_local_command_line (GApplication *app, gchar ***arguments, gint *exit_status) { EmpathyApp *self = (EmpathyApp *) app; + GSimpleAction *action; gint i; gchar **argv; gint argc = 0; - gboolean retval = FALSE; + gboolean retval = TRUE; GError *error = NULL; gboolean no_connect = FALSE, start_hidden = FALSE; @@ -449,12 +423,26 @@ empathy_app_local_command_line (GApplication *app, { NULL } }; + if (!g_application_register (app, NULL, &error)) + { + g_warning ("Impossible to register empathy: %s", error->message); + g_clear_error (&error); + *exit_status = EXIT_FAILURE; + return retval; + } + + action = g_simple_action_new ("open-preferences", G_VARIANT_TYPE_STRING); + g_signal_connect (action, "activate", G_CALLBACK (open_preference_action_cb), app); + g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (action)); + g_object_unref (action); + /* We create a group so that GOptionArgFuncs get the user data */ group = g_option_group_new ("empathy", NULL, NULL, app, NULL); + g_option_group_set_translation_domain (group, GETTEXT_PACKAGE); g_option_group_add_entries (group, options); optcontext = g_option_context_new (N_("- Empathy IM Client")); - g_option_context_add_group (optcontext, gtk_get_option_group (TRUE)); + g_option_context_add_group (optcontext, gtk_get_option_group (FALSE)); g_option_context_set_main_group (optcontext, group); g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE); @@ -473,17 +461,27 @@ empathy_app_local_command_line (GApplication *app, "line options.\n", error->message, argv[0]); g_warning ("Error in empathy init: %s", error->message); + g_clear_error (&error); *exit_status = EXIT_FAILURE; - retval = TRUE; } + else + { + self->no_connect = no_connect; + self->start_hidden = start_hidden; - g_free (argv); + if (self->show_preferences) + { + GVariant *parameter; + parameter = g_variant_new_string (self->preferences_tab ? self->preferences_tab : ""); + g_action_group_activate_action (G_ACTION_GROUP (app), "open-preferences", parameter); + } - g_option_context_free (optcontext); + g_application_activate (app); + } - self->no_connect = no_connect; - self->start_hidden = start_hidden; + g_free (argv); + g_option_context_free (optcontext); return retval; } @@ -502,8 +500,8 @@ empathy_app_class_init (EmpathyAppClass *klass) gobject_class->dispose = empathy_app_dispose; gobject_class->finalize = empathy_app_finalize; - g_app_class->command_line = empathy_app_command_line; g_app_class->local_command_line = empathy_app_local_command_line; + g_app_class->activate = empathy_app_activate; spec = g_param_spec_boolean ("no-connect", "no connect", "Don't connect on startup", @@ -523,17 +521,6 @@ empathy_app_init (EmpathyApp *self) { } -static void -use_conn_notify_cb (GSettings *gsettings, - const gchar *key, - gpointer user_data) -{ - EmpathyConnectivity *connectivity = user_data; - - empathy_connectivity_set_use_conn (connectivity, - g_settings_get_boolean (gsettings, key)); -} - static void migrate_config_to_xdg_dir (void) { @@ -724,7 +711,7 @@ account_manager_chatroom_ready_cb (GObject *source_object, return; } - accounts = tp_account_manager_get_valid_accounts (account_manager); + accounts = tp_account_manager_dup_valid_accounts (account_manager); for (l = accounts; l != NULL; l = g_list_next (l)) { @@ -737,7 +724,7 @@ account_manager_chatroom_ready_cb (GObject *source_object, tp_g_signal_connect_object (account, "notify::connection", G_CALLBACK (account_connection_changed_cb), chatroom_manager, 0); } - g_list_free (accounts); + g_list_free_full (accounts, g_object_unref); } static void @@ -757,10 +744,10 @@ empathy_app_constructed (GObject *object) EmpathyApp *self = (EmpathyApp *) object; gboolean chatroom_manager_ready; + textdomain (GETTEXT_PACKAGE); g_set_application_name (_(PACKAGE_NAME)); gtk_window_set_default_icon_name ("empathy"); - textdomain (GETTEXT_PACKAGE); #ifdef ENABLE_DEBUG /* Set up debug sender */ @@ -775,19 +762,13 @@ empathy_app_constructed (GObject *object) self->gsettings = g_settings_new (EMPATHY_PREFS_SCHEMA); - /* Setting up Connectivity */ - self->connectivity = empathy_connectivity_dup_singleton (); - use_conn_notify_cb (self->gsettings, EMPATHY_PREFS_USE_CONN, - self->connectivity); - g_signal_connect (self->gsettings, - "changed::" EMPATHY_PREFS_USE_CONN, - G_CALLBACK (use_conn_notify_cb), self->connectivity); - /* account management */ self->account_manager = tp_account_manager_dup (); tp_proxy_prepare_async (self->account_manager, NULL, account_manager_ready_cb, self); + tp_account_manager_enable_restart (self->account_manager); + migrate_config_to_xdg_dir (); /* Logging */ @@ -832,6 +813,9 @@ add_empathy_features (void) /* empathy_connection_aggregator_get_all_groups(), used by * EmpathyGroupsWidget relies on it */ TP_CONNECTION_FEATURE_CONTACT_GROUPS, + /* empathy_connection_aggregator_dup_all_contacts(), used by + * EmpathyEventManager relies on it */ + TP_CONNECTION_FEATURE_CONTACT_LIST, NULL); g_object_unref (factory); @@ -843,24 +827,20 @@ main (int argc, char *argv[]) EmpathyApp *app; gint retval; - g_thread_init (NULL); g_type_init (); #ifdef HAVE_LIBCHAMPLAIN - gtk_clutter_init (&argc, &argv); + g_return_val_if_fail (gtk_clutter_init (&argc, &argv) == + CLUTTER_INIT_SUCCESS, 1); #endif g_type_init (); - tpy_cli_init (); empathy_init (); - gtk_init (&argc, &argv); - empathy_gtk_init (); add_empathy_features (); app = g_object_new (EMPATHY_TYPE_APP, - "application-id", EMPATHY_DBUS_NAME, - "flags", G_APPLICATION_HANDLES_COMMAND_LINE, + "application-id", EMPATHY_CHAT_BUS_NAME, NULL); retval = g_application_run (G_APPLICATION (app), argc, argv);