diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-02-11 07:31:27 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-02-12 07:04:30 +0100 |
| commit | a14d2b7ddde3bc2713b31e692331f74f0b5ceb68 (patch) | |
| tree | c24e382ba8df420c1a9c6da42b5d8e459302fe5f /mate-panel/panel-background-monitor.c | |
| parent | 217ce17fff3e4eb3670a03c3d48771a03bf3f9d9 (diff) | |
| download | mate-panel-a14d2b7ddde3bc2713b31e692331f74f0b5ceb68.tar.bz2 mate-panel-a14d2b7ddde3bc2713b31e692331f74f0b5ceb68.tar.xz | |
GTK+3: do not use deprecated n_screens
since gtk+-3.10 screen is always 1
taken from:
https://git.gnome.org/browse/gnome-panel/commit/?id=be976a0
https://git.gnome.org/browse/gnome-panel/commit/?id=272f680
Diffstat (limited to 'mate-panel/panel-background-monitor.c')
| -rw-r--r-- | mate-panel/panel-background-monitor.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/mate-panel/panel-background-monitor.c b/mate-panel/panel-background-monitor.c index 2bd7fe15..a660ca1e 100644 --- a/mate-panel/panel-background-monitor.c +++ b/mate-panel/panel-background-monitor.c @@ -80,7 +80,11 @@ struct _PanelBackgroundMonitor { G_DEFINE_TYPE (PanelBackgroundMonitor, panel_background_monitor, G_TYPE_OBJECT) +#if GTK_CHECK_VERSION (3, 0, 0) +static PanelBackgroundMonitor *global_background_monitor = NULL; +#else static PanelBackgroundMonitor **global_background_monitors = NULL; +#endif static guint signals [LAST_SIGNAL] = { 0 }; @@ -198,6 +202,18 @@ panel_background_monitor_new (GdkScreen *screen) PanelBackgroundMonitor * panel_background_monitor_get_for_screen (GdkScreen *screen) { +#if GTK_CHECK_VERSION (3, 0, 0) + if (!global_background_monitor) { + global_background_monitor = panel_background_monitor_new (screen); + + g_object_add_weak_pointer (G_OBJECT (global_background_monitor), + (void **) &global_background_monitor); + + return global_background_monitor; + } + + return g_object_ref (global_background_monitor); +#else int screen_number; screen_number = gdk_screen_get_number (screen); @@ -222,6 +238,7 @@ panel_background_monitor_get_for_screen (GdkScreen *screen) } return g_object_ref (global_background_monitors [screen_number]); +#endif } static void |