brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to new Mutter plugin initialization method

Browse Source 
With the changes from bug 615586, Mutter now expects a separate start()
method which is called after construction. Move our initialization from
constructed() to start() so it can access the MetaScreen.

https://bugzilla.gnome.org/show_bug.cgi?id=615592
This commit is contained in:
Owen W. Taylor 2010-04-12 17:59:44 -04:00
parent a7cd294403
commit 7467e9e3a5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gnome-shell-plugin.c
View File

@ -45,10 +45,10 @@
#include "shell-global-private.h" #include "shell-global-private.h"
#include "shell-wm.h" #include "shell-wm.h"
static void gnome_shell_plugin_constructed (GObject *object);
static void gnome_shell_plugin_dispose (GObject *object); static void gnome_shell_plugin_dispose (GObject *object);
static void gnome_shell_plugin_finalize (GObject *object); static void gnome_shell_plugin_finalize (GObject *object);
static void gnome_shell_plugin_start (MutterPlugin *plugin);
static void gnome_shell_plugin_minimize (MutterPlugin *plugin, static void gnome_shell_plugin_minimize (MutterPlugin *plugin,
MutterWindow *actor); MutterWindow *actor);
static void gnome_shell_plugin_maximize (MutterPlugin *plugin, static void gnome_shell_plugin_maximize (MutterPlugin *plugin,
@ -118,10 +118,10 @@ gnome_shell_plugin_class_init (GnomeShellPluginClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
MutterPluginClass *plugin_class = MUTTER_PLUGIN_CLASS (klass); MutterPluginClass *plugin_class = MUTTER_PLUGIN_CLASS (klass);
gobject_class->constructed = gnome_shell_plugin_constructed;
gobject_class->dispose = gnome_shell_plugin_dispose; gobject_class->dispose = gnome_shell_plugin_dispose;
gobject_class->finalize = gnome_shell_plugin_finalize; gobject_class->finalize = gnome_shell_plugin_finalize;
plugin_class->start = gnome_shell_plugin_start;
plugin_class->map = gnome_shell_plugin_map; plugin_class->map = gnome_shell_plugin_map;
plugin_class->minimize = gnome_shell_plugin_minimize; plugin_class->minimize = gnome_shell_plugin_minimize;
plugin_class->maximize = gnome_shell_plugin_maximize; plugin_class->maximize = gnome_shell_plugin_maximize;
@ -142,10 +142,9 @@ gnome_shell_plugin_init (GnomeShellPlugin *shell_plugin)
} }
static void static void
gnome_shell_plugin_constructed (GObject *object) gnome_shell_plugin_start (MutterPlugin *plugin)
{ {
MutterPlugin *plugin = MUTTER_PLUGIN (object); GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (plugin);
GnomeShellPlugin *shell_plugin = GNOME_SHELL_PLUGIN (object);
MetaScreen *screen; MetaScreen *screen;
MetaDisplay *display; MetaDisplay *display;
GError *error = NULL; GError *error = NULL;