diff options
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | libmate-desktop/mate-dconf.c | 14 | ||||
| -rw-r--r-- | libmate-desktop/mate-rr-labeler.c | 11 | ||||
| -rw-r--r-- | schemas/org.mate.interface.gschema.xml.in.in | 2 | ||||
| -rw-r--r-- | schemas/org.mate.peripherals-mouse.gschema.xml.in.in | 2 |
5 files changed, 13 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac index 94e1f62..d6ebc18 100644 --- a/configure.ac +++ b/configure.ac @@ -166,15 +166,10 @@ dnl ---------------------------------------------------------------------------- dnl DCONF dnl ---------------------------------------------------------------------------- -DCONF_NEW_REQUIRED=0.13.4 -DCONF_OLD_REQUIRED=0.10.0 - -PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_NEW_REQUIRED], - [AC_DEFINE([HAVE_DCONF_0_13], [1], [Use DCONF >= $DCONF_NEW_REQUIRED])], - [PKG_CHECK_MODULES([DCONF], [dconf >= $DCONF_OLD_REQUIRED], - [AC_DEFINE([HAVE_DCONF_0_10], [1], [Use DCONF $DCONF_OLD_REQUIRED]) - ]) -]) +DCONF_REQUIRED=0.13.4 + +PKG_CHECK_MODULES(DCONF, dconf >= $DCONF_REQUIRED) + AC_SUBST(DCONF_CFLAGS) AC_SUBST(DCONF_LIBS) diff --git a/libmate-desktop/mate-dconf.c b/libmate-desktop/mate-dconf.c index 3820162..bffafbd 100644 --- a/libmate-desktop/mate-dconf.c +++ b/libmate-desktop/mate-dconf.c @@ -37,11 +37,7 @@ static DConfClient * mate_dconf_client_get (void) { -#ifdef HAVE_DCONF_0_13 return dconf_client_new (); -#else - return dconf_client_new (NULL, NULL, NULL, NULL); -#endif } /** @@ -62,11 +58,7 @@ mate_dconf_write_sync (const gchar *key, gboolean ret; DConfClient *client = mate_dconf_client_get (); -#ifdef HAVE_DCONF_0_13 ret = dconf_client_write_sync (client, key, value, NULL, NULL, error); -#else - ret = dconf_client_write (client, key, value, NULL, NULL, error); -#endif g_object_unref (client); @@ -89,11 +81,7 @@ mate_dconf_recursive_reset (const gchar *dir, gboolean ret; DConfClient *client = mate_dconf_client_get (); -#ifdef HAVE_DCONF_0_13 ret = dconf_client_write_sync (client, dir, NULL, NULL, NULL, error); -#else - ret = dconf_client_write (client, dir, NULL, NULL, NULL, error); -#endif g_object_unref (client); @@ -153,9 +141,7 @@ mate_dconf_list_subdirs (const gchar *dir, */ void mate_dconf_sync (void) { -#ifdef HAVE_DCONF_0_13 DConfClient *client = mate_dconf_client_get (); dconf_client_sync (client); g_object_unref (client); -#endif } diff --git a/libmate-desktop/mate-rr-labeler.c b/libmate-desktop/mate-rr-labeler.c index 7f0075b..83357c6 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/schemas/org.mate.interface.gschema.xml.in.in b/schemas/org.mate.interface.gschema.xml.in.in index 8477555..c8b3742 100644 --- a/schemas/org.mate.interface.gschema.xml.in.in +++ b/schemas/org.mate.interface.gschema.xml.in.in @@ -108,7 +108,7 @@ <key name="gtk-overlay-scrolling" type="b"> <default>false</default> <_summary>Use GTK3 overlay scrolling</_summary> - <_description>Whether builtin GTK+ scrolled windows will use overlay scrolling. Overlay scrolling hides and reduces the size of the scrollbar untill it get's focus.</_description> + <_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> 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> |