diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/core/prefs.c | 14 | ||||
| -rw-r--r-- | src/core/util.c | 2 | ||||
| -rw-r--r-- | src/ui/preview-widget.c | 4 |
5 files changed, 18 insertions, 14 deletions
@@ -1,3 +1,7 @@ +1.8.3 + * Bugfixes, support for glib >= 2.43 + * Use zenity instead of mate-dialogs + 1.8.2 * Tell we are Metacity to avoid issues with maximized Java applications * Tell to GTK3 that marco support _GTK_FRAME_EXTENTS hint diff --git a/configure.ac b/configure.ac index 95d69efc..072af5da 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_PREREQ(2.50) m4_define([marco_major_version], [1]) m4_define([marco_minor_version], [8]) -m4_define([marco_micro_version], [2]) +m4_define([marco_micro_version], [3]) m4_define([marco_version], [marco_major_version.marco_minor_version.marco_micro_version]) @@ -489,9 +489,9 @@ fi AC_SUBST(GDK_PIXBUF_CSOURCE) -AC_PATH_PROG(MATEDIALOG, matedialog, no) -if test x"$MATEDIALOG" = xno; then - AC_MSG_ERROR([matedialog not found in your path - needed for dialogs]) +AC_PATH_PROG(ZENITY, zenity, no) +if test x"$ZENITY" = xno; then + AC_MSG_ERROR([zenity not found in your path - needed for dialogs]) fi AC_ARG_ENABLE(debug, diff --git a/src/core/prefs.c b/src/core/prefs.c index 5f46b554..7f747a20 100644 --- a/src/core/prefs.c +++ b/src/core/prefs.c @@ -888,13 +888,6 @@ meta_prefs_init (void) g_hash_table_insert (settings_schemas, KEY_MATE_TERMINAL_SCHEMA, settings_mate_terminal); g_hash_table_insert (settings_schemas, KEY_MATE_MOUSE_SCHEMA, settings_mate_mouse); - /* Pick up initial values. */ - - handle_preference_init_enum (); - handle_preference_init_bool (); - handle_preference_init_string (); - handle_preference_init_int (); - g_signal_connect (settings_general, "changed", G_CALLBACK (change_notify), NULL); g_signal_connect (settings_command, "changed", G_CALLBACK (change_notify), NULL); g_signal_connect (settings_screen_bindings, "changed", G_CALLBACK (change_notify), NULL); @@ -907,6 +900,13 @@ meta_prefs_init (void) g_signal_connect (settings_mate_mouse, "changed::" KEY_MATE_MOUSE_CURSOR_THEME, G_CALLBACK (change_notify), NULL); g_signal_connect (settings_mate_mouse, "changed::" KEY_MATE_MOUSE_CURSOR_SIZE, G_CALLBACK (change_notify), NULL); + /* Pick up initial values. */ + + handle_preference_init_enum (); + handle_preference_init_bool (); + handle_preference_init_string (); + handle_preference_init_int (); + init_bindings (); init_commands (); init_workspace_names (); diff --git a/src/core/util.c b/src/core/util.c index 9b29d2df..ac721009 100644 --- a/src/core/util.c +++ b/src/core/util.c @@ -559,7 +559,7 @@ meta_show_dialog (const char *type, g_slist_length (columns)*2 + g_slist_length (entries))); - argvl[i++] = "matedialog"; + argvl[i++] = "zenity"; argvl[i++] = type; argvl[i++] = "--screen"; argvl[i++] = screen_number_text; diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c index cb05c2f8..a1f4e413 100644 --- a/src/ui/preview-widget.c +++ b/src/ui/preview-widget.c @@ -550,7 +550,7 @@ meta_preview_get_icon (void) NULL); else default_icon = gtk_icon_theme_load_icon (theme, - "gtk-missing-image", + "image-missing", META_ICON_WIDTH, 0, NULL); @@ -583,7 +583,7 @@ meta_preview_get_mini_icon (void) NULL); else default_icon = gtk_icon_theme_load_icon (theme, - "gtk-missing-image", + "image-missing", META_MINI_ICON_WIDTH, 0, NULL); |