Remove Gtk 2 compatibility code
It is useless now that we require Gtk 3. https://bugzilla.gnome.org/show_bug.cgi?id=638315
This commit is contained in:
parent
6a2f038515
commit
0ba7188625
@ -15,7 +15,6 @@ TRAY_STAMP_FILES = stamp-na-marshal.h
|
|||||||
|
|
||||||
# please, keep this sorted alphabetically
|
# please, keep this sorted alphabetically
|
||||||
tray_source = \
|
tray_source = \
|
||||||
gtk-compat.h \
|
|
||||||
tray/na-tray-child.c \
|
tray/na-tray-child.c \
|
||||||
tray/na-tray-child.h \
|
tray/na-tray-child.h \
|
||||||
tray/na-tray-manager.c \
|
tray/na-tray-manager.c \
|
||||||
|
@ -90,7 +90,6 @@ libgnome_shell_la_SOURCES = \
|
|||||||
shell-window-tracker-private.h \
|
shell-window-tracker-private.h \
|
||||||
shell-wm-private.h \
|
shell-wm-private.h \
|
||||||
gnome-shell-plugin.c \
|
gnome-shell-plugin.c \
|
||||||
gtk-compat.h \
|
|
||||||
shell-app.c \
|
shell-app.c \
|
||||||
shell-app-system.c \
|
shell-app-system.c \
|
||||||
shell-app-usage.c \
|
shell-app-usage.c \
|
||||||
|
@ -1,19 +0,0 @@
|
|||||||
#ifndef __GTK_COMPAT_H__
|
|
||||||
#define __GTK_COMPAT_H__
|
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
|
|
||||||
/* Provide a compatibility layer for accessor functions introduced
|
|
||||||
* in GTK+ 2.20 which we need to build with GSEAL_ENABLE.
|
|
||||||
* That way it is still possible to build with GTK+ 2.18 when not
|
|
||||||
* using GSEAL_ENABLE
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if !GTK_CHECK_VERSION(2, 20, 0)
|
|
||||||
|
|
||||||
#define gtk_widget_get_realized(w) GTK_WIDGET_REALIZED (w)
|
|
||||||
#define gtk_widget_get_mapped(w) GTK_WIDGET_MAPPED (w)
|
|
||||||
|
|
||||||
#endif /* GTK_CHECK_VERSION(2, 20, 0) */
|
|
||||||
|
|
||||||
#endif /* __GTK_COMPAT_H__ */
|
|
@ -6,7 +6,6 @@
|
|||||||
#include <clutter/x11/clutter-x11.h>
|
#include <clutter/x11/clutter-x11.h>
|
||||||
|
|
||||||
#include "shell-embedded-window-private.h"
|
#include "shell-embedded-window-private.h"
|
||||||
#include "gtk-compat.h"
|
|
||||||
|
|
||||||
/* This type is a subclass of GtkWindow that ties the window to a
|
/* This type is a subclass of GtkWindow that ties the window to a
|
||||||
* ShellGtkEmbed; the window is reparented into the stage
|
* ShellGtkEmbed; the window is reparented into the stage
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
#include "shell-embedded-window-private.h"
|
#include "shell-embedded-window-private.h"
|
||||||
#include "gtk-compat.h"
|
|
||||||
|
|
||||||
#include <gdk/gdkx.h>
|
#include <gdk/gdkx.h>
|
||||||
|
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
#include "shell-tray-icon.h"
|
#include "shell-tray-icon.h"
|
||||||
#include "shell-gtk-embed.h"
|
#include "shell-gtk-embed.h"
|
||||||
#include "shell-window-tracker.h"
|
#include "shell-window-tracker.h"
|
||||||
#include "gtk-compat.h"
|
|
||||||
#include "tray/na-tray-child.h"
|
#include "tray/na-tray-child.h"
|
||||||
#include <gdk/gdkx.h>
|
#include <gdk/gdkx.h>
|
||||||
#include "st.h"
|
#include "st.h"
|
||||||
|
@ -23,7 +23,6 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "na-tray-child.h"
|
#include "na-tray-child.h"
|
||||||
#include "gtk-compat.h"
|
|
||||||
|
|
||||||
#include <glib/gi18n-lib.h>
|
#include <glib/gi18n-lib.h>
|
||||||
#include <gdk/gdk.h>
|
#include <gdk/gdk.h>
|
||||||
|
@ -25,7 +25,6 @@
|
|||||||
#include <libintl.h>
|
#include <libintl.h>
|
||||||
|
|
||||||
#include "na-tray-manager.h"
|
#include "na-tray-manager.h"
|
||||||
#include "gtk-compat.h"
|
|
||||||
|
|
||||||
#include <glib/gi18n-lib.h>
|
#include <glib/gi18n-lib.h>
|
||||||
#if defined (GDK_WINDOWING_X11)
|
#if defined (GDK_WINDOWING_X11)
|
||||||
|
Loading…
Reference in New Issue
Block a user