[gnome-shell] shell: Drop questionable vfuncs
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] shell: Drop questionable vfuncs
- Date: Thu, 15 Oct 2015 21:10:47 +0000 (UTC)
commit 58f3b7c7482be6f2d80dc18b19e38afc9048d1f4
Author: Florian Müllner <fmuellner gnome org>
Date: Thu Oct 15 22:13:18 2015 +0200
shell: Drop questionable vfuncs
Both ShellAppSystem and ShellTrayManager are used as singletons, which
significantly reduces the usefulness of inheritance - it's unlikely for
extensions to inherit from them anyway (AND use any of the vfuncs), so
drop them to allow defining the types as final in an upcoming commit.
src/shell-app-system.c | 4 ++--
src/shell-app-system.h | 3 ---
src/shell-tray-manager.c | 4 ++--
src/shell-tray-manager.h | 7 -------
4 files changed, 4 insertions(+), 14 deletions(-)
---
diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index a4061cb..108b616 100644
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -64,8 +64,8 @@ static void shell_app_system_class_init(ShellAppSystemClass *klass)
g_signal_new ("installed-changed",
SHELL_TYPE_APP_SYSTEM,
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ShellAppSystemClass, installed_changed),
- NULL, NULL, NULL,
+ 0,
+ NULL, NULL, NULL,
G_TYPE_NONE, 0);
}
diff --git a/src/shell-app-system.h b/src/shell-app-system.h
index 16a2c55..f9ed003 100644
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@@ -29,9 +29,6 @@ struct _ShellAppSystem
struct _ShellAppSystemClass
{
GObjectClass parent_class;
-
- void (*installed_changed)(ShellAppSystem *appsys, gpointer user_data);
- void (*favorites_changed)(ShellAppSystem *appsys, gpointer user_data);
};
GType shell_app_system_get_type (void) G_GNUC_CONST;
diff --git a/src/shell-tray-manager.c b/src/shell-tray-manager.c
index cc2519a..5fe165e 100644
--- a/src/shell-tray-manager.c
+++ b/src/shell-tray-manager.c
@@ -152,7 +152,7 @@ shell_tray_manager_class_init (ShellTrayManagerClass *klass)
g_signal_new ("tray-icon-added",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ShellTrayManagerClass, tray_icon_added),
+ 0,
NULL, NULL, NULL,
G_TYPE_NONE, 1,
CLUTTER_TYPE_ACTOR);
@@ -160,7 +160,7 @@ shell_tray_manager_class_init (ShellTrayManagerClass *klass)
g_signal_new ("tray-icon-removed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (ShellTrayManagerClass, tray_icon_removed),
+ 0,
NULL, NULL, NULL,
G_TYPE_NONE, 1,
CLUTTER_TYPE_ACTOR);
diff --git a/src/shell-tray-manager.h b/src/shell-tray-manager.h
index f19167a..0f281dc 100644
--- a/src/shell-tray-manager.h
+++ b/src/shell-tray-manager.h
@@ -29,13 +29,6 @@ struct _ShellTrayManager
struct _ShellTrayManagerClass
{
GObjectClass parent_class;
-
- void (* tray_icon_added) (ShellTrayManager *manager,
- ClutterActor *icon,
- const char *lowercase_wm_class);
- void (* tray_icon_removed) (ShellTrayManager *manager,
- ClutterActor *icon);
-
};
GType shell_tray_manager_get_type (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]