diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-02-09 13:09:37 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-02-09 15:38:36 +0100 |
| commit | 975c05e2933bede47cc825b013c626324f0a1133 (patch) | |
| tree | b0427be0c2c1635a562aa325c00183588b98798e | |
| parent | 8e66d410cc4b2305eb2f72257dda23811b5d167f (diff) | |
| download | mate-panel-975c05e2933bede47cc825b013c626324f0a1133.tar.bz2 mate-panel-975c05e2933bede47cc825b013c626324f0a1133.tar.xz | |
Kill ubuntu counterhack
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | mate-panel/panel-toplevel.c | 8 |
2 files changed, 0 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac index ae117215..a7b183f1 100644 --- a/configure.ac +++ b/configure.ac @@ -254,22 +254,6 @@ dnl Applets dir AC_SUBST([appletsdir],"\$(datadir)/mate-panel/applets") -dnl **************************************************************************** -dnl * Ubuntu hacks -dnl **************************************************************************** -AC_ARG_ENABLE(ubuntu, - AS_HELP_STRING([--enable-ubuntu], [Enable Ubuntu Counter Hacks]), enable_ubuntu=yes, enable_ubuntu=no) - -if test "x$enable_ubuntu" = "xyes" ; then - # we define a UBUNTU on code - PANEL_CFLAGS="$PANEL_CFLAGS -DUBUNTU" - - ENABLE_UBUNTU=yes -else - ENABLE_UBUNTU=no -fi - - dnl Language Support GETTEXT_PACKAGE=mate-panel @@ -386,7 +370,6 @@ echo " Maintainer mode: ${USE_MAINTAINER_MODE} Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags} Gtk+ version: ${GTK_API_VERSION} - Ubuntu Counter Hack: ${ENABLE_UBUNTU} Applets to build in-process: ${PANEL_INPROCESS_APPLETS} XRandr support: ${have_randr} Build introspection support: ${found_introspection} diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c index 18c28315..6bbc22ba 100644 --- a/mate-panel/panel-toplevel.c +++ b/mate-panel/panel-toplevel.c @@ -4895,14 +4895,6 @@ panel_toplevel_init (PanelToplevel *toplevel) { int i; - /* This is a hack for the default resize grip on Ubuntu. - * We need to add a --enable-ubuntu for this. - * Now, it is also default in GTK3. - */ -#if defined(UBUNTU) || GTK_CHECK_VERSION (3, 0, 0) - gtk_window_set_has_resize_grip(&toplevel->window_instance, FALSE); -#endif - toplevel->priv = PANEL_TOPLEVEL_GET_PRIVATE (toplevel); toplevel->priv->expand = TRUE; |