GNOME.org
 

[glib/glib-2-26] branch glib-2-26, dropping GApplication

commit d647439ff71d5b71c1ddcb960271e8924e5849a6
Author: Ryan Lortie <desrt desrt ca>
Date:   Fri Sep 17 13:36:46 2010 -0400

    branch glib-2-26, dropping GApplication
    
    See
    http://mail.gnome.org/archives/desktop-devel-list/2010-September/msg00016.html
    for more information.

 docs/reference/gio/gio-docs.xml     |    8 -
 docs/reference/gio/gio-sections.txt |  149 ----
 docs/reference/gio/gio.types        |    5 -
 gio/Makefile.am                     |   18 +-
 gio/gaction.c                       |  375 ----------
 gio/gaction.h                       |   91 ---
 gio/gactiongroup.c                  |  517 --------------
 gio/gactiongroup.h                  |  150 ----
 gio/gapplication.c                  | 1337 -----------------------------------
 gio/gapplication.h                  |  149 ----
 gio/gdbusapplication.c              |  424 -----------
 gio/gio.h                           |    5 -
 gio/gio.symbols                     |   75 --
 gio/giotypes.h                      |    4 -
 gio/gnullapplication.c              |   74 --
 gio/gsimpleaction.c                 |  498 -------------
 gio/gsimpleaction.h                 |   95 ---
 gio/gsimpleactiongroup.c            |  380 ----------
 gio/gsimpleactiongroup.h            |   87 ---
 gio/tests/.gitignore                |    4 -
 gio/tests/Makefile.am               |   15 -
 gio/tests/actions.c                 |  268 -------
 gio/tests/application.c             |  222 ------
 gio/tests/testapp.c                 |  107 ---
 gio/tests/testapps.c                |  604 ----------------
 po/POTFILES.in                      |    3 -
 26 files changed, 1 insertions(+), 5663 deletions(-)
---
diff --git a/docs/reference/gio/gio-docs.xml b/docs/reference/gio/gio-docs.xml
index d6c8361..d5b9e65 100644
--- a/docs/reference/gio/gio-docs.xml
+++ b/docs/reference/gio/gio-docs.xml
@@ -163,14 +163,6 @@
         <xi:include href="xml/gpermission.xml"/>
         <xi:include href="xml/gsimplepermission.xml"/>
     </chapter>
-    <chapter id="application">
-        <title>Application support</title>
-        <xi:include href="xml/gactiongroup.xml"/>
-        <xi:include href="xml/gsimpleactiongroup.xml"/>
-        <xi:include href="xml/gaction.xml"/>
-        <xi:include href="xml/gsimpleaction.xml"/>
-        <xi:include href="xml/gapplication.xml"/>
-    </chapter>
     <chapter id="extending">
         <title>Extending GIO</title>
         <xi:include href="xml/gvfs.xml"/>
diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index 368797c..469c232 100644
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -2658,155 +2658,6 @@ g_simple_permission_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gapplication</FILE>
-GApplication
-GApplicationClass
-
-g_application_new
-g_application_register
-g_application_try_new
-g_application_unregistered_try_new
-g_application_get_instance
-g_application_get_id
-g_application_add_action
-g_application_remove_action
-g_application_list_actions
-g_application_set_action_enabled
-g_application_get_action_enabled
-g_application_get_action_description
-g_application_invoke_action
-g_application_run
-g_application_quit_with_data
-g_application_is_remote
-<SUBSECTION Standard>
-G_TYPE_APPLICATION
-G_APPLICATION
-G_APPLICATION_CLASS
-G_IS_APPLICATION
-G_IS_APPLICATION_CLASS
-G_APPLICATION_GET_CLASS
-<SUBSECTION Private>
-GApplicationPrivate
-g_application_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gactiongroup</FILE>
-<TITLE>GActionGroup</TITLE>
-GActionGroup
-
-<SUBSECTION>
-g_action_group_has_action
-g_action_group_list_actions
-
-<SUBSECTION>
-g_action_group_get_enabled
-g_action_group_get_parameter_type
-g_action_group_get_state_type
-g_action_group_get_state_hint
-
-<SUBSECTION>
-g_action_group_get_state
-g_action_group_set_state
-
-<SUBSECTION>
-g_action_group_activate
-
-<SUBSECTION>
-g_action_group_action_added
-g_action_group_action_removed
-g_action_group_action_enabled_changed
-g_action_group_action_state_changed
-
-<SUBSECTION Standard>
-g_action_group_get_type
-GActionGroupPrivate
-G_TYPE_ACTION_GROUP
-G_IS_ACTION_GROUP
-G_ACTION_GROUP_GET_INTERFACE
-G_ACTION_GROUP
-</SECTION>
-
-<SECTION>
-<FILE>gaction</FILE>
-<TITLE>GAction</TITLE>
-GAction
-
-<SUBSECTION>
-g_action_get_name
-g_action_get_parameter_type
-g_action_get_state_type
-g_action_get_state_hint
-
-<SUBSECTION>
-g_action_get_enabled
-g_action_get_state
-g_action_set_state
-
-<SUBSECTION>
-g_action_activate
-
-<SUBSECTION Standard>
-g_action_get_type
-G_TYPE_ACTION
-G_IS_ACTION
-G_ACTION_GET_INTERFACE
-G_ACTION
-</SECTION>
-
-<SECTION>
-<FILE>gsimpleaction</FILE>
-<TITLE>GSimpleAction</TITLE>
-GSimpleAction
-GSimpleActionClass
-
-<SUBSECTION>
-g_simple_action_new
-g_simple_action_new_stateful
-
-<SUBSECTION>
-g_simple_action_set_enabled
-
-<SUBSECTION Standard>
-GSimpleActionPrivate
-g_simple_action_get_type
-G_TYPE_SIMPLE_ACTION
-G_IS_SIMPLE_ACTION
-G_SIMPLE_ACTION_CLASS
-G_SIMPLE_ACTION_GET_CLASS
-G_IS_SIMPLE_ACTION_CLASS
-G_SIMPLE_ACTION
-</SECTION>
-
-<SECTION>
-<FILE>gsimpleactiongroup</FILE>
-<TITLE>GSimpleActionGroup</TITLE>
-GSimpleActionGroup
-
-<SUBSECTION>
-g_simple_action_group_new
-
-<SUBSECTION>
-g_simple_action_group_lookup
-g_simple_action_group_insert
-g_simple_action_group_remove
-
-<SUBSECTION>
-g_simple_action_group_set_enabled
-
-<SUBSECTION Standard>
-GSimpleActionGroupClass
-GSimpleActionGroupPrivate
-g_simple_action_group_get_type
-G_TYPE_SIMPLE_ACTION_GROUP
-G_IS_SIMPLE_ACTION_GROUP
-G_SIMPLE_ACTION_GROUP_CLASS
-G_SIMPLE_ACTION_GROUP_GET_CLASS
-G_IS_SIMPLE_ACTION_GROUP_CLASS
-G_SIMPLE_ACTION_GROUP
-</SECTION>
-
-<SECTION>
 <FILE>gproxyresolver</FILE>
 <TITLE>GProxyResolver</TITLE>
 GProxyResolver
diff --git a/docs/reference/gio/gio.types b/docs/reference/gio/gio.types
index 7ebd6c4..53b9c7f 100644
--- a/docs/reference/gio/gio.types
+++ b/docs/reference/gio/gio.types
@@ -1,11 +1,6 @@
-g_action_get_type
-g_simple_action_get_type
-g_action_group_get_type
-g_simple_action_group_get_type
 g_app_info_create_flags_get_type
 g_app_info_get_type
 g_app_launch_context_get_type
-g_application_get_type
 g_ask_password_flags_get_type
 g_async_initable_get_type
 g_async_result_get_type
diff --git a/gio/Makefile.am b/gio/Makefile.am
index 25b6077..ccd1fac 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -134,20 +134,6 @@ settings_sources += \
 	gregistrysettingsbackend.c
 endif
 
-application_headers = \
-	gactiongroup.h			\
-	gsimpleactiongroup.h		\
-	gaction.h			\
-	gsimpleaction.h			\
-	gapplication.h
-
-application_sources = \
-	gactiongroup.c			\
-	gsimpleactiongroup.c		\
-	gaction.c			\
-	gsimpleaction.c			\
-	gapplication.c
-
 local_sources = \
 	glocaldirectorymonitor.c 	\
 	glocaldirectorymonitor.h 	\
@@ -388,14 +374,13 @@ libgio_2_0_la_SOURCES =		\
 	$(appinfo_sources) 	\
 	$(unix_sources) 	\
 	$(win32_sources) 	\
-	$(application_sources) 	\
 	$(settings_sources) 	\
 	$(gdbus_sources) 	\
 	$(local_sources) 	\
 	$(marshal_sources) 	\
 	$(NULL)
 
-EXTRA_DIST += gnullapplication.c gdbusapplication.c strinfo.c
+EXTRA_DIST += strinfo.c
 
 $(libgio_2_0_la_OBJECTS): $(marshal_sources)
 
@@ -525,7 +510,6 @@ gio_headers =			\
 	gvolumemonitor.h 	\
 	gzlibcompressor.h	\
 	gzlibdecompressor.h	\
-	$(application_headers)	\
 	$(settings_headers)	\
 	$(gdbus_headers)	\
 	$(NULL)
diff --git a/gio/gio.h b/gio/gio.h
index db1f13b..a7bf993 100644
--- a/gio/gio.h
+++ b/gio/gio.h
@@ -28,11 +28,6 @@
 #include <gio/giotypes.h>
 
 #include <gio/gappinfo.h>
-#include <gio/gaction.h>
-#include <gio/gsimpleaction.h>
-#include <gio/gactiongroup.h>
-#include <gio/gsimpleactiongroup.h>
-#include <gio/gapplication.h>
 #include <gio/gasyncinitable.h>
 #include <gio/gasyncresult.h>
 #include <gio/gbufferedinputstream.h>
diff --git a/gio/gio.symbols b/gio/gio.symbols
index 0e33f61..4c49501 100644
--- a/gio/gio.symbols
+++ b/gio/gio.symbols
@@ -24,28 +24,6 @@ g_vfs_get_local
 #endif
 #endif
 
-#if IN_HEADER(__G_APPLICATION_H__)
-#if IN_FILE(__G_APPLICATION_C__)
-g_application_get_type G_GNUC_CONST
-g_application_new
-g_application_get_instance
-g_application_get_id
-g_application_set_action_enabled
-g_application_get_action_enabled
-g_application_get_action_description
-g_application_add_action
-g_application_remove_action
-g_application_invoke_action
-g_application_list_actions
-g_application_run
-g_application_register
-g_application_try_new
-g_application_unregistered_try_new
-g_application_quit_with_data
-g_application_is_remote
-#endif
-#endif
-
 #if IN_HEADER(__G_APP_INFO_H__)
 #if IN_FILE(__G_APP_INFO_C__)
 g_app_info_get_type G_GNUC_CONST
@@ -1878,56 +1856,3 @@ g_simple_permission_get_type
 g_simple_permission_new
 #endif
 #endif
-
-#if IN_HEADER(__G_ACTION_GROUP_H__)
-#if IN_FILE(__G_ACTION_GROUP_C__)
-g_action_group_action_added
-g_action_group_action_enabled_changed
-g_action_group_action_removed
-g_action_group_action_state_changed
-g_action_group_activate
-g_action_group_get_enabled
-g_action_group_get_parameter_type
-g_action_group_get_state
-g_action_group_get_state_hint
-g_action_group_get_state_type
-g_action_group_get_type
-g_action_group_has_action
-g_action_group_list_actions
-g_action_group_set_state
-#endif
-#endif
-
-#if IN_HEADER(__G_ACTION_H__)
-#if IN_FILE(__G_ACTION_C__)
-g_action_activate
-g_action_get_enabled
-g_action_get_name
-g_action_get_parameter_type
-g_action_get_state
-g_action_get_state_hint
-g_action_get_state_type
-g_action_get_type
-g_action_set_state
-#endif
-#endif
-
-#if IN_HEADER(__G_SIMPLE_ACTION_GROUP_H__)
-#if IN_FILE(__G_SIMPLE_ACTION_GROUP_C__)
-g_simple_action_group_get_type G_GNUC_CONST
-g_simple_action_group_insert
-g_simple_action_group_lookup
-g_simple_action_group_new
-g_simple_action_group_remove
-#endif
-#endif
-
-#if IN_HEADER(__G_SIMPLE_ACTION_H__)
-#if IN_FILE(__G_SIMPLE_ACTION_C__)
-g_simple_action_get_parameter_type
-g_simple_action_get_type
-g_simple_action_new
-g_simple_action_new_stateful
-g_simple_action_set_enabled
-#endif
-#endif
diff --git a/gio/giotypes.h b/gio/giotypes.h
index ecd1dc0..0d8296a 100644
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -47,10 +47,6 @@ typedef struct _GSimplePermission             GSimplePermission;
 typedef struct _GZlibCompressor               GZlibCompressor;
 typedef struct _GZlibDecompressor             GZlibDecompressor;
 
-typedef struct _GSimpleActionGroup            GSimpleActionGroup;
-typedef struct _GActionGroup                  GActionGroup;
-typedef struct _GSimpleAction                 GSimpleAction;
-typedef struct _GAction                       GAction;
 typedef struct _GSettingsBackend              GSettingsBackend;
 typedef struct _GSettings                     GSettings;
 typedef struct _GPermission                   GPermission;
diff --git a/gio/tests/.gitignore b/gio/tests/.gitignore
index 1291433..6fcd48f 100644
--- a/gio/tests/.gitignore
+++ b/gio/tests/.gitignore
@@ -1,7 +1,5 @@
-actions
 appinfo
 appinfo-test
-application
 async-close-output-stream
 buffered-input-stream
 buffered-output-stream
@@ -64,8 +62,6 @@ sleepy-stream
 socket-client
 socket-server
 srvtarget
-testapp
-testapps
 test.mo
 unix-fd
 unix-streams
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 8e42a90..edd5a07 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -18,7 +18,6 @@ progs_ldadd     = 					\
 	$(top_builddir)/gio/libgio-2.0.la
 
 TEST_PROGS +=	 		\
-	actions 		\
 	memory-input-stream 	\
 	memory-output-stream 	\
 	readwrite		\
@@ -58,8 +57,6 @@ TEST_PROGS +=			\
 	gdbus-exit-on-close	\
 	gdbus-non-socket	\
 	gdbus-bz627724		\
-	application		\
-	testapps		\
 	appinfo			\
 	contenttype		\
 	file			\
@@ -83,7 +80,6 @@ SAMPLE_PROGS = 				\
 	gdbus-example-peer		\
 	gdbus-example-proxy-subclass	\
 	gdbus-connection-flush-helper	\
-	testapp				\
 	appinfo-test			\
 	proxy				\
 	$(NULL)
@@ -98,8 +94,6 @@ if OS_WIN32
 TEST_PROGS += win32-streams
 endif
 
-actions_LDADD	  = $(progs_ldadd)
-
 memory_input_stream_SOURCES	  = memory-input-stream.c
 memory_input_stream_LDADD	  = $(progs_ldadd)
 
@@ -287,21 +281,12 @@ gdbus_example_export_LDADD   = $(progs_ldadd)
 gdbus_connection_flush_helper_SOURCES = gdbus-connection-flush-helper.c
 gdbus_connection_flush_helper_LDADD = $(progs_ldadd)
 
-application_SOURCES = application.c gdbus-sessionbus.c gdbus-sessionbus.h
-application_LDADD   = $(progs_ldadd)
-
 appinfo_SOURCES = appinfo.c
 appinfo_LDADD   = $(progs_ldadd)
 
 appinfo_test_SOURCES = appinfo-test.c
 appinfo_test_LDADD   = $(progs_ldadd)
 
-testapp_SOURCES = testapp.c
-testapp_LDADD   = $(progs_ldadd)
-
-testapps_SOURCES = testapps.c gdbus-sessionbus.c gdbus-sessionbus.h
-testapps_LDADD   = $(progs_ldadd)
-
 contenttype_SOURCES = contenttype.c
 contenttype_LDADD   = $(progs_ldadd)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9f1281a..9d0fc84 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,10 +16,7 @@ glib/gspawn.c
 glib/gutf8.c
 glib/goption.c
 glib/gkeyfile.c
-gio/gaction.c
-gio/gactiongroup.c
 gio/gappinfo.c
-gio/gapplication.c
 gio/gasynchelper.c
 gio/gasyncinitable.c
 gio/gasyncresult.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]