From d0b429af482d759f33b82002362ecd8630edc943 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 6 Apr 2012 19:15:53 -0400 Subject: [PATCH] Revert "GDesktopAppInfo: add an accessor for StartupWMClass" This reverts commit 3ccc4cf91d4ee20df4207f04d3344ee33f1b5c94. --- docs/reference/gio/gio-sections.txt | 1 - gio/gdesktopappinfo.c | 23 +---------------------- gio/gdesktopappinfo.h | 1 - gio/gio.symbols | 1 - gio/tests/appinfo-test.desktop | 2 -- gio/tests/appinfo.c | 15 --------------- 6 files changed, 1 insertion(+), 42 deletions(-) diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt index 5d08b46..6212c5e 100644 --- a/docs/reference/gio/gio-sections.txt +++ b/docs/reference/gio/gio-sections.txt @@ -1463,7 +1463,6 @@ g_desktop_app_info_get_show_in g_desktop_app_info_get_generic_name g_desktop_app_info_get_categories g_desktop_app_info_get_keywords -g_desktop_app_info_get_startup_wm_class g_desktop_app_info_set_desktop_env GDesktopAppLaunchCallback g_desktop_app_info_launch_uris_as_manager diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c index 2353293..4afa6dc 100644 --- a/gio/gdesktopappinfo.c +++ b/gio/gdesktopappinfo.c @@ -65,7 +65,6 @@ #define GENERIC_NAME_KEY "GenericName" #define FULL_NAME_KEY "X-GNOME-FullName" #define KEYWORDS_KEY "Keywords" -#define STARTUP_WM_CLASS_KEY "StartupWMClass" enum { PROP_0, @@ -107,13 +106,13 @@ struct _GDesktopAppInfo char *binary; char *path; char *categories; - char *startup_wm_class; guint nodisplay : 1; guint hidden : 1; guint terminal : 1; guint startup_notify : 1; guint no_fuse : 1; + /* FIXME: what about StartupWMClass ? */ }; typedef enum { @@ -186,7 +185,6 @@ g_desktop_app_info_finalize (GObject *object) g_free (info->binary); g_free (info->path); g_free (info->categories); - g_free (info->startup_wm_class); G_OBJECT_CLASS (g_desktop_app_info_parent_class)->finalize (object); } @@ -332,7 +330,6 @@ g_desktop_app_info_load_from_keyfile (GDesktopAppInfo *info, info->no_fuse = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, "X-GIO-NoFuse", NULL) != FALSE; info->hidden = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_HIDDEN, NULL) != FALSE; info->categories = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_CATEGORIES, NULL); - info->startup_wm_class = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, STARTUP_WM_CLASS_KEY, NULL); info->icon = NULL; if (info->icon_name) @@ -3397,21 +3394,3 @@ g_desktop_app_info_lookup_get_default_for_uri_scheme (GDesktopAppInfoLookup *loo } G_GNUC_END_IGNORE_DEPRECATIONS - -/** - * g_desktop_app_info_get_startup_wm_class: - * @app_info: a #GDesktopAppInfo that supports startup notify - * - * Retrieves the StartupWMClass field from @app_info. This represents the - * WM_CLASS property of the main window of the application, if launched through - * @app_info. - * Returns: (transfer none): the startup WM class, or NULL if none is set - * in the desktop file. - */ -const char * -g_desktop_app_info_get_startup_wm_class (GDesktopAppInfo *app_info) -{ - g_return_val_if_fail (G_IS_DESKTOP_APP_INFO (app_info), NULL); - - return app_info->startup_wm_class; -} diff --git a/gio/gdesktopappinfo.h b/gio/gdesktopappinfo.h index c6e975d..fcc41ed 100644 --- a/gio/gdesktopappinfo.h +++ b/gio/gdesktopappinfo.h @@ -56,7 +56,6 @@ const char * const *g_desktop_app_info_get_keywords (GDesktopAppInfo *info); gboolean g_desktop_app_info_get_nodisplay (GDesktopAppInfo *info); gboolean g_desktop_app_info_get_show_in (GDesktopAppInfo *info, const gchar *desktop_env); -const char * g_desktop_app_info_get_startup_wm_class (GDesktopAppInfo *info); GDesktopAppInfo *g_desktop_app_info_new (const char *desktop_id); gboolean g_desktop_app_info_get_is_hidden (GDesktopAppInfo *info); diff --git a/gio/gio.symbols b/gio/gio.symbols index d632d49..2489a0b 100644 --- a/gio/gio.symbols +++ b/gio/gio.symbols @@ -106,7 +106,6 @@ g_desktop_app_info_get_is_hidden g_desktop_app_info_get_keywords g_desktop_app_info_get_nodisplay g_desktop_app_info_get_show_in -g_desktop_app_info_get_startup_wm_class g_desktop_app_info_get_type g_desktop_app_info_launch_uris_as_manager g_desktop_app_info_lookup_get_type diff --git a/gio/tests/appinfo-test.desktop b/gio/tests/appinfo-test.desktop index f2b873a..0a64cfb 100644 --- a/gio/tests/appinfo-test.desktop +++ b/gio/tests/appinfo-test.desktop @@ -8,5 +8,3 @@ Comment=GAppInfo example Comment[de]=GAppInfo Beispiel Exec=./appinfo-test --option Icon=testicon -StartupNotify=true -StartupWMClass=appinfo-class diff --git a/gio/tests/appinfo.c b/gio/tests/appinfo.c index bb24669..d0a8207 100644 --- a/gio/tests/appinfo.c +++ b/gio/tests/appinfo.c @@ -273,20 +273,6 @@ test_environment (void) g_object_unref (ctx); } -static void -test_startup_wm_class (void) -{ - GDesktopAppInfo *appinfo; - const char *wm_class; - - appinfo = g_desktop_app_info_new_from_filename (SRCDIR "/appinfo-test.desktop"); - wm_class = g_desktop_app_info_get_startup_wm_class (appinfo); - - g_assert_cmpstr (wm_class, ==, "appinfo-class"); - - g_object_unref (appinfo); -} - int main (int argc, char *argv[]) { @@ -302,7 +288,6 @@ main (int argc, char *argv[]) g_test_add_func ("/appinfo/tryexec", test_tryexec); g_test_add_func ("/appinfo/associations", test_associations); g_test_add_func ("/appinfo/environment", test_environment); - g_test_add_func ("/appinfo/startup-wm-class", test_startup_wm_class); return g_test_run (); } -- 2.7.4