[nautilus-actions] Get rid of EggSMClient utilities and unused BaseISession interface
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] Get rid of EggSMClient utilities and unused BaseISession interface
- Date: Wed, 15 Feb 2017 23:02:09 +0000 (UTC)
commit 0b308910dcc20c139540d4b2e1f7ce6b0e2db006
Author: Pierre Wieser <pwieser trychlos org>
Date: Wed Feb 15 12:36:06 2017 +0100
Get rid of EggSMClient utilities and unused BaseISession interface
configure.ac | 2 -
src/ui/Makefile.am | 6 -
src/ui/base-isession.c | 406 ------------
src/ui/base-isession.h | 78 ---
src/ui/egg-sm-client-private.h | 62 --
src/ui/egg-sm-client-xsmp.c | 1405 ----------------------------------------
src/ui/egg-sm-client.c | 614 ------------------
src/ui/egg-sm-client.h | 118 ----
src/ui/fma-application.c | 28 -
src/ui/fma-application.h | 2 -
10 files changed, 0 insertions(+), 2721 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f0b8688..f3a7b1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,8 +105,6 @@ FMA_CHECK_MODULE([GIO_UNIX],[gio-unix-2.0])
FMA_CHECK_MODULE([GTOP], [libgtop-2.0],[${gtop_required}])
FMA_CHECK_MODULE([LIBXML], [libxml-2.0], [${xml_required}])
FMA_CHECK_MODULE([UUID], [uuid], [${uuid_required}])
-FMA_CHECK_MODULE([SM], [sm], [1.0])
-FMA_CHECK_MODULE([ICE], [ice])
AC_SUBST([NAUTILUS_ACTIONS_CFLAGS])
AC_SUBST([NAUTILUS_ACTIONS_LIBS])
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index ec4b7d7..3e0ccb3 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -56,17 +56,11 @@ fma_config_tool_SOURCES = \
base-dialog.h \
base-gtk-utils.c \
base-gtk-utils.h \
- base-isession.c \
- base-isession.h \
base-keysyms.h \
base-window.c \
base-window.h \
egg-desktop-file.c \
egg-desktop-file.h \
- egg-sm-client.c \
- egg-sm-client.h \
- egg-sm-client-private.h \
- egg-sm-client-xsmp.c \
egg-tree-multi-dnd.c \
egg-tree-multi-dnd.h \
main.c \
diff --git a/src/ui/fma-application.c b/src/ui/fma-application.c
index e092de2..68d2daf 100644
--- a/src/ui/fma-application.c
+++ b/src/ui/fma-application.c
@@ -38,7 +38,6 @@
#include "core/fma-about.h"
-#include "base-isession.h"
#include "fma-application.h"
#include "fma-main-window.h"
#include "fma-menu.h"
@@ -86,7 +85,6 @@ static gboolean manage_options( FMAApplication *application );
static void application_startup( GApplication *application );
static void application_activate( GApplication *application );
static void application_open( GApplication *application, GFile **files, gint n_files, const gchar *hint
);
-static void isession_iface_init( BaseISessionInterface *iface, void *user_data );
GType
fma_application_get_type( void )
@@ -118,18 +116,10 @@ register_type( void )
( GInstanceInitFunc ) instance_init
};
- static const GInterfaceInfo isession_iface_info = {
- ( GInterfaceInitFunc ) isession_iface_init,
- NULL,
- NULL
- };
-
g_debug( "%s", thisfn );
type = g_type_register_static( GTK_TYPE_APPLICATION, "FMAApplication", &info, 0 );
- g_type_add_interface_static( type, BASE_TYPE_ISESSION, &isession_iface_info );
-
return( type );
}
@@ -275,7 +265,6 @@ fma_application_run_with_args( FMAApplication *application, int argc, GStrv argv
init_i18n( application );
g_set_application_name( priv->application_name );
gtk_window_set_default_icon_name( priv->icon_name );
- base_isession_init( BASE_ISESSION( application ));
if( init_gtk_args( application ) &&
manage_options( application )){
@@ -560,20 +549,3 @@ fma_application_get_updater( const FMAApplication *application )
return( updater );
}
-
-gboolean
-fma_application_is_willing_to_quit( const FMAApplication *application )
-{
- g_return_val_if_fail( FMA_IS_APPLICATION( application ), TRUE );
- g_return_val_if_fail( BASE_IS_ISESSION( application ), TRUE );
-
- return( base_isession_is_willing_to_quit( BASE_ISESSION( application )));
-}
-
-static void
-isession_iface_init( BaseISessionInterface *iface, void *user_data )
-{
- static const gchar *thisfn = "fma_application_isession_iface_init";
-
- g_debug( "%s: iface=%p, user_data=%p", thisfn, ( void * ) iface, ( void * ) user_data );
-}
diff --git a/src/ui/fma-application.h b/src/ui/fma-application.h
index 53e3399..88e231a 100644
--- a/src/ui/fma-application.h
+++ b/src/ui/fma-application.h
@@ -105,8 +105,6 @@ gchar *fma_application_get_application_name( const FMAApplication *appl
FMAUpdater *fma_application_get_updater ( const FMAApplication *application );
-gboolean fma_application_is_willing_to_quit ( const FMAApplication *application );
-
G_END_DECLS
#endif /* __UI_FMA_APPLICATION_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]