diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | libmate-desktop/mate-rr-labeler.c | 11 | ||||
| -rw-r--r-- | mate-about/mate-about.h | 2 | ||||
| -rw-r--r-- | schemas/org.mate.interface.gschema.xml.in.in | 5 | ||||
| -rw-r--r-- | schemas/org.mate.peripherals-mouse.gschema.xml.in.in | 2 |
5 files changed, 20 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 470f07f..13a45ed 100644 --- a/configure.ac +++ b/configure.ac @@ -32,10 +32,8 @@ AM_MAINTAINER_MODE IT_PROG_INTLTOOL([0.40.0]) -AC_ISC_POSIX AC_PROG_CC AC_STDC_HEADERS -AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL PKG_PROG_PKG_CONFIG @@ -74,6 +72,12 @@ if test "x$enable_deprecation_flags" = "xyes"; then AC_SUBST(DISABLE_DEPRECATED_CFLAGS) fi +# GLib min/max required versions +AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_36], + [Warn on use of APIs added after GLib 2.36]) +AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36], + [Warn on use of APIs deprecated before GLib 2.36]) + # Should we build mate-about? Useful for people who need to build # two mate-desktop using two different versions of GTK+ AC_ARG_ENABLE([mate-about], @@ -127,8 +131,6 @@ dnl it too, or it will never make it into the spec file! dnl ---------------------------------------------------------------------------- dnl GTK library version dnl ---------------------------------------------------------------------------- -GTK_API_VERSION=2.0 -GTK_REQUIRED=2.24.0 AC_MSG_CHECKING([which gtk+ version to compile against]) AC_ARG_WITH([gtk], diff --git a/libmate-desktop/mate-rr-labeler.c b/libmate-desktop/mate-rr-labeler.c index e65ced5..673c03a 100644 --- a/libmate-desktop/mate-rr-labeler.c +++ b/libmate-desktop/mate-rr-labeler.c @@ -420,7 +420,7 @@ create_label_window (MateRRLabeler *labeler, MateRROutputInfo *output, GdkColor GtkWidget *window; GtkWidget *widget; char *str; - const char *display_name; + char *display_name; GdkColor black = { 0, 0, 0, 0 }; int x,y; @@ -452,10 +452,13 @@ create_label_window (MateRRLabeler *labeler, MateRROutputInfo *output, GdkColor * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas". */ display_name = _("Mirror Screens"); - } else - display_name = mate_rr_output_info_get_display_name (output); + str = g_strdup_printf ("<b>%s</b>", display_name); + } else { + display_name = g_strdup_printf ("<b>%s</b>\n<small>%s</small>", mate_rr_output_info_get_display_name (output), mate_rr_output_info_get_name (output)); + str = g_strdup_printf ("%s", display_name); + } + g_free (display_name); - str = g_strdup_printf ("<b>%s</b>", display_name); widget = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (widget), str); g_free (str); diff --git a/mate-about/mate-about.h b/mate-about/mate-about.h index a06cad9..f4ecba0 100644 --- a/mate-about/mate-about.h +++ b/mate-about/mate-about.h @@ -21,10 +21,10 @@ #ifndef __MATE_ABOUT_H__ #define __MATE_ABOUT_H__ +#include <config.h> // autogenerated by ./configure #include <gtk/gtk.h> #include <libintl.h> // for gettext #include <glib/gi18n.h> -#include <config.h> // autogenerated by ./configure #include <libmate-desktop/mate-aboutdialog.h> diff --git a/schemas/org.mate.interface.gschema.xml.in.in b/schemas/org.mate.interface.gschema.xml.in.in index 979024b..c8b3742 100644 --- a/schemas/org.mate.interface.gschema.xml.in.in +++ b/schemas/org.mate.interface.gschema.xml.in.in @@ -105,6 +105,11 @@ <_summary>Use GTK3 header bar</_summary> <_description>Whether builtin GTK+ dialogs such as the file chooser, the color chooser or the font chooser will use a header bar at the top to show action widgets, or an action area at the bottom. This setting does not affect custom dialogs using GtkDialog directly, or message dialogs.</_description> </key> + <key name="gtk-overlay-scrolling" type="b"> + <default>false</default> + <_summary>Use GTK3 overlay scrolling</_summary> + <_description>Whether built-in GTK+ scrolled windows will use overlay scrolling. Overlay scrolling hides and reduces the size of the scrollbar until it gets focus.</_description> + </key> <key name="gtk-enable-animations" type="b"> <default>true</default> <_summary>Enable Gtk toolkit-wide animations</_summary> diff --git a/schemas/org.mate.peripherals-mouse.gschema.xml.in.in b/schemas/org.mate.peripherals-mouse.gschema.xml.in.in index 0722818..3817d9d 100644 --- a/schemas/org.mate.peripherals-mouse.gschema.xml.in.in +++ b/schemas/org.mate.peripherals-mouse.gschema.xml.in.in @@ -31,7 +31,7 @@ <_description>Length of a double click.</_description> </key> <key name="middle-button-enabled" type="b"> - <default>false</default> + <default>true</default> <_summary>Middle button emulation</_summary> <_description>Enables middle mouse button emulation through simultaneous left and right button click.</_description> </key> |