[gedit/wip/gtkapp: 4/16] Die smclient die



commit f236bd9de9a082fc4a12c1fbab10be5fd83d30db
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Jul 29 16:07:43 2012 +0200

    Die smclient die

 configure.ac                         |   15 -
 gedit/Makefile.am                    |    7 +-
 gedit/gedit-app-x11.c                |    2 -
 gedit/gedit-command-line.c           |    2 -
 gedit/gedit-session.c                |  597 -------------
 gedit/gedit-session.h                |   49 --
 gedit/gedit.c                        |    5 -
 gedit/smclient/Makefile.am           |   52 --
 gedit/smclient/eggdesktopfile.c      | 1528 ----------------------------------
 gedit/smclient/eggdesktopfile.h      |  163 ----
 gedit/smclient/eggsmclient-osx.c     |  235 ------
 gedit/smclient/eggsmclient-private.h |   59 --
 gedit/smclient/eggsmclient-win32.c   |  353 --------
 gedit/smclient/eggsmclient-xsmp.c    | 1380 ------------------------------
 gedit/smclient/eggsmclient.c         |  604 --------------
 gedit/smclient/eggsmclient.h         |  117 ---
 16 files changed, 1 insertions(+), 5167 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7317d26..92882ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -358,20 +358,6 @@ GEDIT_LIBS="$GEDIT_LIBS $X11_LIBS $UNIX_LIBS"
 AC_SUBST(GEDIT_CFLAGS)
 AC_SUBST(GEDIT_LIBS)
 
-if test "$os_osx" = "no" &&
-   test "$os_win32" = "no"; then
-	PKG_CHECK_MODULES(EGG_SMCLIENT, [
-		sm >= 1.0.0
-		ice
-	])
-else
-	EGG_SMCLIENT_CFLAGS=
-	EGG_SMCLIENT_LIBS=
-fi
-
-AC_SUBST(EGG_SMCLIENT_CFLAGS)
-AC_SUBST(EGG_SMCLIENT_LIBS)
-
 dnl ================================================================
 dnl GSettings stuff
 dnl ================================================================
@@ -452,7 +438,6 @@ data/org.gnome.gedit.gschema.xml.in
 data/Makefile
 docs/Makefile
 docs/reference/Makefile
-gedit/smclient/Makefile
 gedit/theatrics/Makefile
 gedit/Makefile
 help/Makefile
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index 54a7797..282c22b 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-SUBDIRS = smclient theatrics
+SUBDIRS = theatrics
 
 bin_PROGRAMS = gedit
 
@@ -10,7 +10,6 @@ pkglib_LTLIBRARIES = libgedit-private.la
 INCLUDES =								\
 	-I$(top_srcdir)							\
 	-I$(srcdir)							\
-	-I$(srcdir)/smclient						\
 	$(GEDIT_CFLAGS)							\
 	$(GTK_MAC_CFLAGS)						\
 	$(WARN_CFLAGS)							\
@@ -27,7 +26,6 @@ gedit_LDADD =			\
 	libgedit-private.la	\
 	$(GEDIT_LIBS)		\
 	$(GTK_MAC_LIBS)		\
-	$(EGG_SMCLIENT_LIBS)	\
 	$(INTROSPECTION_LIBS)
 
 if PLATFORM_WIN32
@@ -39,7 +37,6 @@ endif
 libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
 
 libgedit_la_LIBADD = \
-	smclient/libeggsmclient.la	\
 	theatrics/libtheatrics.la
 
 # GEDIT_LIBS must be the last to ensure correct order on some platforms
@@ -126,7 +123,6 @@ NOINST_H_FILES =			\
 	gedit-print-job.h		\
 	gedit-print-preview.h		\
 	gedit-replace-dialog.h		\
-	gedit-session.h			\
 	gedit-settings.h		\
 	gedit-status-combo-box.h	\
 	gedit-tab-label.h		\
@@ -216,7 +212,6 @@ libgedit_c_files =			\
 	gedit-print-preview.c		\
 	gedit-progress-info-bar.c	\
 	gedit-replace-dialog.c		\
-	gedit-session.c			\
 	gedit-settings.c		\
 	gedit-statusbar.c		\
 	gedit-status-combo-box.c	\
diff --git a/gedit/gedit-app-x11.c b/gedit/gedit-app-x11.c
index 215923d..4667b5e 100644
--- a/gedit/gedit-app-x11.c
+++ b/gedit/gedit-app-x11.c
@@ -21,7 +21,6 @@
  */
 
 #include "gedit-app-x11.h"
-#include "eggdesktopfile.h"
 
 #define GEDIT_APP_X11_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GEDIT_TYPE_APP_X11, GeditAppX11Private))
 
@@ -44,7 +43,6 @@ gedit_app_x11_class_init (GeditAppX11Class *klass)
 static void
 gedit_app_x11_init (GeditAppX11 *self)
 {
-	egg_set_desktop_file (DATADIR "/applications/gedit.desktop");
 }
 
 /* ex:set ts=8 noet: */
diff --git a/gedit/gedit-command-line.c b/gedit/gedit-command-line.c
index 45d2515..e3e285e 100644
--- a/gedit/gedit-command-line.c
+++ b/gedit/gedit-command-line.c
@@ -37,7 +37,6 @@
 #endif
 
 #include "gedit-command-line.h"
-#include "eggsmclient.h"
 
 #define GEDIT_COMMAND_LINE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE((object), GEDIT_TYPE_COMMAND_LINE, GeditCommandLinePrivate))
 
@@ -334,7 +333,6 @@ gedit_command_line_parse (GeditCommandLine   *command_line,
 	context = g_option_context_new (_("- Edit text files"));
 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
-	g_option_context_add_group (context, egg_sm_client_get_option_group ());
 
 #ifdef ENABLE_INTROSPECTION
 	g_option_context_add_group (context, g_irepository_get_option_group ());
diff --git a/gedit/gedit.c b/gedit/gedit.c
index 448f3cc..f240cdd 100644
--- a/gedit/gedit.c
+++ b/gedit/gedit.c
@@ -42,7 +42,6 @@
 #include "gedit-debug.h"
 #include "gedit-dirs.h"
 #include "gedit-plugins-engine.h"
-#include "gedit-session.h"
 
 #ifndef ENABLE_GVFS_METADATA
 #include "gedit-metadata-manager.h"
@@ -110,10 +109,6 @@ main (int argc, char *argv[])
 	gedit_debug_message (DEBUG_APP, "Init plugins");
 	engine = gedit_plugins_engine_get_default ();
 
-	/* Initialize session management */
-	gedit_debug_message (DEBUG_APP, "Init session manager");
-	gedit_session_init ();
-
 	gedit_debug_message (DEBUG_APP, "Run application");
 	app = gedit_app_get_default ();
 	status = g_application_run (G_APPLICATION (app), argc, argv);



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