diff options
Diffstat (limited to 'libwnck/screen.c')
-rw-r--r-- | libwnck/screen.c | 53 |
1 files changed, 6 insertions, 47 deletions
diff --git a/libwnck/screen.c b/libwnck/screen.c index 094f23e..f102943 100644 --- a/libwnck/screen.c +++ b/libwnck/screen.c @@ -103,14 +103,10 @@ struct _WnckScreenPrivate guint update_handler; -#ifdef HAVE_STARTUP_NOTIFICATION - SnDisplay *sn_display; -#endif - guint showing_desktop : 1; guint vertical_workspaces : 1; - _WnckLayoutCorner starting_corner; + WnckLayoutCorner starting_corner; gint rows_of_workspaces; gint columns_of_workspaces; @@ -498,30 +494,9 @@ wnck_screen_finalize (GObject *object) g_free (screen->priv->wm_name); screen->priv->wm_name = NULL; -#ifdef HAVE_STARTUP_NOTIFICATION - sn_display_unref (screen->priv->sn_display); - screen->priv->sn_display = NULL; -#endif - G_OBJECT_CLASS (wnck_screen_parent_class)->finalize (object); } -#ifdef HAVE_STARTUP_NOTIFICATION -static void -sn_error_trap_push (SnDisplay *display, - Display *xdisplay) -{ - _wnck_error_trap_push (xdisplay); -} - -static void -sn_error_trap_pop (SnDisplay *display, - Display *xdisplay) -{ - _wnck_error_trap_pop (xdisplay); -} -#endif /* HAVE_STARTUP_NOTIFICATION */ - void _wnck_screen_construct (WnckScreen *screen, WnckHandle *handle, @@ -535,12 +510,6 @@ _wnck_screen_construct (WnckScreen *screen, screen->priv->xscreen = ScreenOfDisplay (display, number); screen->priv->number = number; -#ifdef HAVE_STARTUP_NOTIFICATION - screen->priv->sn_display = sn_display_new (display, - sn_error_trap_push, - sn_error_trap_pop); -#endif - screen->priv->bg_pixmap = None; screen->priv->orig_event_mask = _wnck_select_input (screen->priv->xscreen, @@ -2460,11 +2429,11 @@ _wnck_screen_get_xscreen (WnckScreen *screen) * to make it really better, use a WnckScreenLayout struct. We might also want * to wait for deprecation of WnckWorkspaceLayout. */ void -_wnck_screen_get_workspace_layout (WnckScreen *screen, - _WnckLayoutOrientation *orientation, - int *rows, - int *columns, - _WnckLayoutCorner *starting_corner) +wnck_screen_get_workspace_layout (WnckScreen *screen, + WnckLayoutOrientation *orientation, + int *rows, + int *columns, + WnckLayoutCorner *starting_corner) { g_return_if_fail (WNCK_IS_SCREEN (screen)); @@ -2618,16 +2587,6 @@ wnck_screen_move_viewport (WnckScreen *screen, _wnck_change_viewport (screen->priv->xscreen, x, y); } -#ifdef HAVE_STARTUP_NOTIFICATION -SnDisplay* -_wnck_screen_get_sn_display (WnckScreen *screen) -{ - g_return_val_if_fail (WNCK_IS_SCREEN (screen), NULL); - - return screen->priv->sn_display; -} -#endif /* HAVE_STARTUP_NOTIFICATION */ - void _wnck_screen_change_workspace_name (WnckScreen *screen, int number, |