[xchat-gnome] build: Remove smclient



commit 21242bf68f71e4061ae689dcf06e3f4d6382b069
Author: Christian Persch <chpe gnome org>
Date:   Wed Sep 25 12:58:16 2013 +0200

    build: Remove smclient

 configure.ac                             |    8 -
 src/Makefile.am                          |    2 +-
 src/fe-gnome/fe-gnome.c                  |   34 -
 src/libeggsmclient/Makefile.am           |   36 -
 src/libeggsmclient/eggdesktopfile.c      | 1510 ------------------------------
 src/libeggsmclient/eggdesktopfile.h      |  160 ----
 src/libeggsmclient/eggsmclient-private.h |   53 -
 src/libeggsmclient/eggsmclient-xsmp.c    | 1370 ---------------------------
 src/libeggsmclient/eggsmclient.c         |  589 ------------
 src/libeggsmclient/eggsmclient.h         |  117 ---
 10 files changed, 1 insertions(+), 3878 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1b81b0d..e323c12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,13 +67,6 @@ PKG_CHECK_MODULES([DEPENDENCIES], [\
                   gconf-2.0 >= $GCONF_REQUIRED \
                   ])
 
-#EggSMClient replacing GnomeClient in libgnome
-PKG_CHECK_MODULES([EGG_SMCLIENT], [\
-                  gtk+-3.0 >= $GTK_REQUIRED \
-                  sm >= $SM_REQUIRED \
-                  ice \
-                  ])
-
 #D-Bus
 AC_MSG_CHECKING([whether D-Bus support is requested])
 AC_ARG_ENABLE([dbus],
@@ -478,7 +471,6 @@ src/common/dbus/Makefile
 src/common/Makefile
 src/fe-gnome/Makefile
 src/libcontrast/Makefile
-src/libeggsmclient/Makefile
 src/Makefile
 ])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0e763f6..1e9465d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1 @@
-SUBDIRS = common libcontrast libeggsmclient fe-gnome
+SUBDIRS = common libcontrast fe-gnome
diff --git a/src/fe-gnome/fe-gnome.c b/src/fe-gnome/fe-gnome.c
index 19428f1..fdea986 100644
--- a/src/fe-gnome/fe-gnome.c
+++ b/src/fe-gnome/fe-gnome.c
@@ -25,8 +25,6 @@
 #include <unistd.h>
 #include <glib.h>
 #include <gconf/gconf-client.h>
-#include "../libeggsmclient/eggsmclient.h"
-#include "../libeggsmclient/eggdesktopfile.h"
 #include "gui.h"
 #include "navigation-tree.h"
 #include "main-window.h"
@@ -74,10 +72,6 @@ static GOptionEntry entries[] = {
        { NULL }
 };
 
-static void     setup_sm        (gint                argc,
-                                 gchar              *argv[]);
-static void     quit_session    (EggSMClient        *client,
-                                 gpointer            client_data);
 static gboolean not_autoconnect (void);
 
 static gchar *
@@ -134,7 +128,6 @@ fe_args (int argc, char *argv[])
 
        g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
        g_option_context_add_group (context, gtk_get_option_group (FALSE));
-       g_option_context_add_group (context, egg_sm_client_get_option_group ());
 
        gtk_init (&argc, &argv);
 
@@ -157,7 +150,6 @@ fe_args (int argc, char *argv[])
        }
 
        load_accels ();
-       setup_sm (argc, argv);
 
        return -1;
 }
@@ -1071,32 +1063,6 @@ void fe_get_file (const char  *title,
        /* FIXME: implement */
 }
 
-static void
-setup_sm (gint argc, gchar *argv[])
-{
-       EggSMClient *client;
-       gchar *desktop_file;
-
-       client = egg_sm_client_get ();
-       desktop_file = g_build_filename (DATADIR, "applications", "xchat-gnome.desktop", NULL);
-       egg_set_desktop_file (desktop_file);
-       g_free (desktop_file);
-
-       g_signal_connect (G_OBJECT (client), "quit", G_CALLBACK (quit_session), NULL);
-
-       /* FIXME: add discard command to remove saved state */
-}
-
-static void
-quit_session (EggSMClient* client, gpointer client_data)
-{
-       gtk_widget_hide (GTK_WIDGET (gui.main_window));
-       gtk_widget_hide (GTK_WIDGET (gui.dcc));
-       userlist_gui_hide ();
-       gui.quit = TRUE;
-       xchat_exit ();
-}
-
 static gboolean
 not_autoconnect (void)
 {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]