[empathy] Remove some cruft from split empathy-chat
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Remove some cruft from split empathy-chat
- Date: Thu, 17 Aug 2017 03:27:21 +0000 (UTC)
commit 4ee680b59c810fdd237ec20c1e3e73606d71fcca
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Wed Aug 16 22:07:45 2017 -0500
Remove some cruft from split empathy-chat
src/Makefile.am | 17 ---------
src/empathy-chat.c | 93 ----------------------------------------------------
2 files changed, 0 insertions(+), 110 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 605bf9b..9ef6c42 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,21 +84,6 @@ empathy_auth_client_SOURCES = \
empathy-auth-client.c \
$(NULL)
-empathy_chat_SOURCES = \
- chat-manager-interface.c chat-manager-interface.h \
- empathy-about-dialog.c empathy-about-dialog.h \
- empathy-chat-manager.c empathy-chat-manager.h \
- empathy-chat-window.c empathy-chat-window.h \
- empathy-invite-participant-dialog.c empathy-invite-participant-dialog.h \
- empathy-chat.c \
- polari-fixed-size-frame.c polari-fixed-size-frame.h \
- $(NULL)
-
-nodist_empathy_chat_SOURCES = \
- empathy-chat-resources.c \
- empathy-chat-resources.h \
- $(NULL)
-
empathy_call_SOURCES = \
empathy-call.c \
empathy-call-factory.c \
@@ -175,7 +160,6 @@ check_c_sources = \
$(empathy_accounts_SOURCES) \
$(empathy_debugger_SOURCES) \
$(empathy_auth_client_SOURCES) \
- $(empathy_chat_SOURCES) \
$(empathy_call_SOURCES)
include $(top_srcdir)/tools/check-coding-style.mk
@@ -216,7 +200,6 @@ chat-manager-interface.h: Makefile.am Chat_Manager.xml
Chat_Manager.xml
BUILT_SOURCES = \
- $(nodist_empathy_chat_SOURCES) \
chat-manager-interface.c \
chat-manager-interface.h \
$(NULL)
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 42be4bd..202caa8 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -81,96 +81,3 @@ activate_cb (GApplication *application)
g_signal_connect (chat_mgr, "displayed-chats-changed",
G_CALLBACK (displayed_chats_changed_cb), GUINT_TO_POINTER (1));
}
-
-int
-main (int argc,
- char *argv[])
-{
- GOptionContext *optcontext;
- GOptionEntry options[] = {
- { NULL }
- };
- GResource *resource;
-#ifdef ENABLE_DEBUG
- TpDebugSender *debug_sender;
-#endif
- GError *error = NULL;
- EmpathyPresenceManager *presence_mgr;
- EmpathyThemeManager *theme_mgr;
- gint retval;
-
- optcontext = g_option_context_new (N_("— Empathy Chat Client"));
- g_option_context_add_group (optcontext, gtk_get_option_group (FALSE));
- g_option_context_add_main_entries (optcontext, options, GETTEXT_PACKAGE);
- g_option_context_set_translation_domain (optcontext, GETTEXT_PACKAGE);
-
- if (!g_option_context_parse (optcontext, &argc, &argv, &error))
- {
- g_print ("%s\nRun '%s --help' to see a full list of available command "
- "line options.\n",
- error->message, argv[0]);
- g_warning ("Error in empathy-av init: %s", error->message);
- return EXIT_FAILURE;
- }
-
- g_option_context_free (optcontext);
-
- empathy_init ();
-
- /* Make empathy and empathy-chat appear as the same app in gnome-shell */
- g_set_prgname ("empathy");
- gtk_window_set_default_icon_name ("empathy");
- textdomain (GETTEXT_PACKAGE);
-
- notify_init (_(PACKAGE_NAME));
-
- resource = empathy_chat_get_resource ();
- g_resources_register (resource);
-
- 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
- /* Set up debug sender */
- debug_sender = tp_debug_sender_dup ();
- g_log_set_default_handler (tp_debug_sender_log_handler, G_LOG_DOMAIN);
-#endif
-
- /* Setting up Idle */
- presence_mgr = empathy_presence_manager_dup_singleton ();
-
- /* Keep the theme manager alive as it does some caching */
- theme_mgr = empathy_theme_manager_dup_singleton ();
-
- if (g_getenv ("EMPATHY_PERSIST") != NULL)
- {
- DEBUG ("Disable timer");
-
- use_timer = FALSE;
- }
-
- /* the inactivity timeout can only be set while the application is held */
- g_application_hold (G_APPLICATION (app));
- g_application_set_inactivity_timeout (G_APPLICATION (app), TIMEOUT * 1000);
- g_application_release (G_APPLICATION (app));
-
- DEBUG ("Waiting for text channels to handle");
-
- retval = g_application_run (G_APPLICATION (app), argc, argv);
-
- g_object_unref (app);
- g_object_unref (presence_mgr);
- g_object_unref (theme_mgr);
- tp_clear_object (&chat_mgr);
-
-#ifdef ENABLE_DEBUG
- g_object_unref (debug_sender);
-#endif
-
- g_resources_unregister (resource);
- g_resource_unref (resource);
-
- notify_uninit ();
-
- return retval;
-}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]