Hello community, here is the log from the commit of package metacity checked in at Wed Aug 16 18:45:32 CEST 2006. -------- --- GNOME/metacity/metacity.changes 2006-06-15 23:38:40.000000000 +0200 +++ metacity/metacity.changes 2006-08-16 18:14:59.000000000 +0200 @@ -1,0 +2,30 @@ +Wed Aug 16 16:56:32 CEST 2006 - jhargadon@suse.de + +- update to version 2.15.21 +- Add a constrain_titlebar_visible constraint +- remove the infinite edge resistance +- make it so maximized windows do not have rounded corners +- fix the heuristic for determining if windows can be made + fullscreen +- make sure window features get recalculated when the screen is + resized +- react to _NET_STARTUP_ID changes +- return the window to maximized state if the window was "shaken + loose" from maximized state during a resize but the resize is later + aborted +- fix button lighting with dragged clicks +- don't minimize in response to double clicks on the titlebar when + minimiziation should not be allowed +- fix some titlebar-not-on-screen constraint issues +- fix a logic bug so that the whole titlebar becomes sensitive to + mouse clicks +- make mouse cursor when moving windows become a hand +- Fix a crash on exit/logout from assuming a compositor would always + exist +- prevent long titles from "sticking" in the tasklist +- handle sync counter notifications in the compositor +- prevent a crash when changing resolution +- Add a tabbing function, bound to alt-f6 by default, to cycle + through the windows of the current application + +------------------------------------------------------------------- Old: ---- metacity-2.12.2.tar.bz2 New: ---- metacity-2.15.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metacity.spec ++++++ --- /var/tmp/diff_new_pack.s6oiRn/_old 2006-08-16 18:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.s6oiRn/_new 2006-08-16 18:44:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package metacity (Version 2.12.2) +# spec file for package metacity (Version 2.15.21) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,8 +17,8 @@ License: GPL Group: System/GUI/GNOME Autoreqprov: on -Version: 2.12.2 -Release: 26 +Version: 2.15.21 +Release: 1 Summary: A Fast Window Manager for the GNOME 2.x Desktop Source: metacity-%{version}.tar.bz2 Patch: metacity-ping-timeout.patch @@ -46,19 +46,16 @@ gnome-patch-translation-prepare %patch -p1 %patch2 -p1 -%patch3 -p1 +#%patch3 -p1 %patch4 -p1 -%patch5 -p1 +#%patch5 -p1 %patch6 -p1 -%patch7 +#%patch7 %patch8 %patch9 -p1 gnome-patch-translation-update %build -rename no nb po/no.* -sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && \ - mv configure.in.tmp configure.in intltoolize --force autoreconf -fi ## HACK ALERT BEGIN @@ -113,6 +110,33 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n metacity +* Wed Aug 16 2006 - jhargadon@suse.de +- update to version 2.15.21 +- Add a constrain_titlebar_visible constraint +- remove the infinite edge resistance +- make it so maximized windows do not have rounded corners +- fix the heuristic for determining if windows can be made + fullscreen +- make sure window features get recalculated when the screen is + resized +- react to _NET_STARTUP_ID changes +- return the window to maximized state if the window was "shaken + loose" from maximized state during a resize but the resize is later + aborted +- fix button lighting with dragged clicks +- don't minimize in response to double clicks on the titlebar when + minimiziation should not be allowed +- fix some titlebar-not-on-screen constraint issues +- fix a logic bug so that the whole titlebar becomes sensitive to + mouse clicks +- make mouse cursor when moving windows become a hand +- Fix a crash on exit/logout from assuming a compositor would always + exist +- prevent long titles from "sticking" in the tasklist +- handle sync counter notifications in the compositor +- prevent a crash when changing resolution +- Add a tabbing function, bound to alt-f6 by default, to cycle + through the windows of the current application * Thu Jun 15 2006 - jimmyk@suse.de - Added a keybinding for opening the main-menu when the windows key is pressed, BNC #155437. ++++++ metacity-2.12.0-border-effects-2.patch ++++++ --- /var/tmp/diff_new_pack.s6oiRn/_old 2006-08-16 18:44:58.000000000 +0200 +++ /var/tmp/diff_new_pack.s6oiRn/_new 2006-08-16 18:44:58.000000000 +0200 @@ -1,6 +1,6 @@ ---- metacity-2.12.1/src/effects.c -+++ metacity-2.12.1/src/effects.c -@@ -311,6 +311,9 @@ +--- metacity-2.15.21/src/effects.c ++++ metacity-2.15.21/src/effects.c +@@ -438,6 +438,9 @@ { BoxAnimationContext *context; @@ -10,7 +10,7 @@ g_return_if_fail (seconds_duration > 0.0); if (g_getenv ("METACITY_DEBUG_EFFECTS")) -@@ -435,6 +438,9 @@ +@@ -562,6 +565,9 @@ int width, int height) { @@ -20,7 +20,7 @@ /* Grab the X server to avoid screen dirt */ meta_display_grab (screen->display); meta_ui_push_delay_exposes (screen->ui); -@@ -601,6 +607,9 @@ +@@ -728,6 +734,9 @@ int new_width, int new_height) { @@ -30,7 +30,7 @@ if (old_rect) draw_xor_rect (screen, old_rect, old_width, old_height); -@@ -616,6 +625,9 @@ +@@ -743,6 +752,9 @@ int old_width, int old_height) { @@ -40,9 +40,9 @@ meta_effects_update_wireframe (screen, old_rect, old_width, old_height, NULL, -1, -1); ---- metacity-2.12.1/src/metacity.schemas.in -+++ metacity-2.12.1/src/metacity.schemas.in -@@ -1935,6 +1935,20 @@ +--- metacity-2.15.21/src/metacity.schemas.in ++++ metacity-2.15.21/src/metacity.schemas.in +@@ -2072,6 +2072,20 @@ </locale> </schema> @@ -63,47 +63,47 @@ </schemalist> </gconfschemafile> ---- metacity-2.12.1/src/prefs.c -+++ metacity-2.12.1/src/prefs.c -@@ -69,6 +69,7 @@ +--- metacity-2.15.21/src/prefs.c ++++ metacity-2.15.21/src/prefs.c +@@ -73,6 +73,7 @@ #define KEY_VISUAL_BELL_TYPE "/apps/metacity/general/visual_bell_type" #define KEY_CURSOR_THEME "/desktop/gnome/peripherals/mouse/cursor_theme" #define KEY_CURSOR_SIZE "/desktop/gnome/peripherals/mouse/cursor_size" +#define KEY_BORDER_EFFECTS "/apps/metacity/general/border_effects" + #define KEY_COMPOSITING_MANAGER "/apps/metacity/general/compositing_manager" #ifdef HAVE_GCONF - static GConfClient *default_client = NULL; -@@ -96,6 +97,7 @@ +@@ -103,6 +104,7 @@ static gboolean gnome_accessibility = FALSE; static char *cursor_theme = NULL; static int cursor_size = 24; +static gboolean border_effects = TRUE; + static gboolean compositing_manager = FALSE; - static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_INVALID; - static MetaButtonLayout button_layout = { -@@ -151,6 +153,7 @@ + static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_FULLSCREEN_FLASH; +@@ -166,6 +168,7 @@ static gboolean update_gnome_accessibility (gboolean value); static gboolean update_cursor_theme (const char *value); static gboolean update_cursor_size (int size); +static gboolean update_border_effects (gboolean value); + static gboolean update_compositing_manager (gboolean value); static void change_notify (GConfClient *client, - guint cnxn_id, -@@ -455,6 +458,11 @@ +@@ -513,6 +516,11 @@ &err); cleanup_error (&err); update_cursor_size (int_val); + + bool_val = gconf_client_get_bool (default_client, KEY_BORDER_EFFECTS, -+ &err); ++ &err); + cleanup_error (&err); + update_border_effects (bool_val); - #endif /* HAVE_GCONF */ - - /* Load keybindings prefs */ -@@ -928,6 +936,18 @@ - if (update_cursor_size (d)) - queue_changed (META_PREF_CURSOR_SIZE); + #else /* HAVE_GCONF */ + /* Set defaults for some values that can't be set at initialization time of + * the static globals. In the case of the theme, note that there is code +@@ -1060,6 +1068,18 @@ + if (update_compositing_manager (b)) + queue_changed (META_PREF_COMPOSITING_MANAGER); } + else if (strcmp (key, KEY_BORDER_EFFECTS) == 0) + { @@ -120,20 +120,30 @@ else { meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n", -@@ -1594,6 +1614,10 @@ +@@ -1783,6 +1803,9 @@ case META_PREF_GNOME_ACCESSIBILITY: return "GNOME_ACCESSIBILTY"; + ++ case META_PREF_BORDER_EFFECTS: ++ return "BORDER_EFFECTS"; ++ + case META_PREF_CURSOR_THEME: + return "CURSOR_THEME"; + +@@ -2627,6 +2650,10 @@ + default: + key = g_strdup_printf (KEY_COMMAND_PREFIX"%d", i + 1); break; + case META_PREF_BORDER_EFFECTS: + return "BORDER_EFFECTS"; + break; + } - - return "(unknown)"; -@@ -2367,3 +2391,21 @@ - - g_assert_not_reached (); + + return key; +@@ -2971,3 +2998,21 @@ + { + return compositing_manager; } + +#ifdef HAVE_GCONF @@ -153,31 +163,31 @@ +{ + return border_effects; +} ---- metacity-2.12.1/src/prefs.h -+++ metacity-2.12.1/src/prefs.h -@@ -51,7 +51,8 @@ +--- metacity-2.15.21/src/prefs.h ++++ metacity-2.15.21/src/prefs.h +@@ -54,7 +54,8 @@ META_PREF_GNOME_ACCESSIBILITY, - META_PREF_RAISE_ON_CLICK, META_PREF_CURSOR_THEME, -- META_PREF_CURSOR_SIZE -+ META_PREF_CURSOR_SIZE, + META_PREF_CURSOR_SIZE, +- META_PREF_COMPOSITING_MANAGER ++ META_PREF_COMPOSITING_MANAGER, + META_PREF_BORDER_EFFECTS } MetaPreference; typedef void (* MetaPrefsChangedFunc) (MetaPreference pref, -@@ -98,6 +99,8 @@ - const char* meta_prefs_get_cursor_theme (void); +@@ -104,6 +105,8 @@ int meta_prefs_get_cursor_size (void); + gboolean meta_prefs_get_compositing_manager (void); +const gboolean meta_prefs_get_border_effects (void); + /* Screen bindings */ #define META_KEYBINDING_WORKSPACE_1 "switch_to_workspace_1" #define META_KEYBINDING_WORKSPACE_2 "switch_to_workspace_2" ---- metacity-2.12.1/src/tabpopup.c -+++ metacity-2.12.1/src/tabpopup.c -@@ -166,7 +166,9 @@ - screen_number)); +--- metacity-2.15.21/src/tabpopup.c ++++ metacity-2.15.21/src/tabpopup.c +@@ -235,7 +235,9 @@ + screen); gtk_widget_set_app_paintable (popup->outline_window, TRUE); - gtk_widget_realize (popup->outline_window); @@ -187,7 +197,7 @@ g_signal_connect (G_OBJECT (popup->outline_window), "expose_event", G_CALLBACK (outline_window_expose), popup); -@@ -476,7 +478,8 @@ +@@ -481,7 +483,8 @@ * with gdk functions. */ GTK_WIDGET_SET_FLAGS (popup->outline_window, GTK_MAPPED); ++++++ metacity-2.12.2.tar.bz2 -> metacity-2.15.21.tar.bz2 ++++++ ++++ 207858 lines of diff (skipped) ++++++ metacity-windows-key-binding.patch ++++++ --- /var/tmp/diff_new_pack.s6oiRn/_old 2006-08-16 18:45:07.000000000 +0200 +++ /var/tmp/diff_new_pack.s6oiRn/_new 2006-08-16 18:45:07.000000000 +0200 @@ -1,7 +1,6 @@ -diff -uprN metacity-2.12.2-base/src/keybindings.c metacity-2.12.2/src/keybindings.c ---- metacity-2.12.2-base/src/keybindings.c 2006-06-15 12:30:47.000000000 -0400 -+++ metacity-2.12.2/src/keybindings.c 2006-06-15 14:52:00.000000000 -0400 -@@ -194,6 +194,12 @@ static void handle_run_terminal (M +--- metacity-2.15.21/src/keybindings.c ++++ metacity-2.15.21/src/keybindings.c +@@ -195,6 +195,12 @@ XEvent *event, MetaKeyBinding *binding); @@ -14,7 +13,7 @@ /* debug */ static gboolean process_keyboard_move_grab (MetaDisplay *display, MetaScreen *screen, -@@ -844,6 +850,7 @@ bindings_changed_callback (MetaPreferenc +@@ -871,6 +877,7 @@ switch (pref) { case META_PREF_SCREEN_KEYBINDINGS: @@ -22,7 +21,7 @@ rebuild_screen_binding_table (display); reload_keycodes (display); reload_modifiers (display); -@@ -1070,6 +1077,23 @@ ungrab_all_keys (MetaDisplay *display, +@@ -1097,6 +1104,23 @@ meta_error_trap_pop (display, FALSE); } @@ -46,7 +45,7 @@ void meta_screen_grab_keys (MetaScreen *screen) { -@@ -1079,6 +1103,8 @@ meta_screen_grab_keys (MetaScreen *scree +@@ -1106,6 +1130,8 @@ if (screen->keys_grabbed) return; @@ -55,7 +54,7 @@ grab_keys (screen->display->screen_bindings, screen->display->n_screen_bindings, screen->display, screen->xroot); -@@ -1598,6 +1624,13 @@ meta_display_process_key_event (MetaDisp +@@ -1631,6 +1657,13 @@ all_keys_grabbed = window ? window->all_keys_grabbed : screen->all_keys_grabbed; if (!all_keys_grabbed) { @@ -69,7 +68,7 @@ /* Do the normal keybindings */ process_event (display->screen_bindings, display->n_screen_bindings, -@@ -2932,18 +2965,15 @@ handle_toggle_desktop (MetaDisplay *d +@@ -2904,18 +2937,15 @@ } static void @@ -93,7 +92,7 @@ action_atom = None; switch (action) { -@@ -2982,6 +3012,19 @@ handle_panel_keybinding (MetaDisplay +@@ -2954,6 +2984,19 @@ } static void @@ -113,11 +112,9 @@ handle_activate_menu (MetaDisplay *display, MetaScreen *screen, MetaWindow *event_window, -Los ficheros metacity-2.12.2-base/src/.keybindings.c.swp y metacity-2.12.2/src/.keybindings.c.swp son distintos -diff -uprN metacity-2.12.2-base/src/metacity.schemas.in metacity-2.12.2/src/metacity.schemas.in ---- metacity-2.12.2-base/src/metacity.schemas.in 2006-06-15 12:30:57.000000000 -0400 -+++ metacity-2.12.2/src/metacity.schemas.in 2006-06-15 12:31:59.000000000 -0400 -@@ -294,6 +294,22 @@ +--- metacity-2.15.21/src/metacity.schemas.in ++++ metacity-2.15.21/src/metacity.schemas.in +@@ -351,6 +351,22 @@ </locale> </schema> @@ -140,10 +137,9 @@ <!-- Window Keybindings --> <schema> -diff -uprN metacity-2.12.2-base/src/prefs.c metacity-2.12.2/src/prefs.c ---- metacity-2.12.2-base/src/prefs.c 2006-06-15 12:30:30.000000000 -0400 -+++ metacity-2.12.2/src/prefs.c 2006-06-15 12:31:59.000000000 -0400 -@@ -54,6 +54,7 @@ +--- metacity-2.15.21/src/prefs.c ++++ metacity-2.15.21/src/prefs.c +@@ -57,6 +57,7 @@ #define KEY_BUTTON_LAYOUT "/apps/metacity/general/button_layout" #define KEY_REDUCED_RESOURCES "/apps/metacity/general/reduced_resources" #define KEY_GNOME_ACCESSIBILITY "/desktop/gnome/interface/accessibility" @@ -151,7 +147,7 @@ #define KEY_COMMAND_PREFIX "/apps/metacity/keybinding_commands/command_" -@@ -96,6 +97,7 @@ static gboolean provide_visual_bell = TR +@@ -103,6 +104,7 @@ static gboolean bell_is_audible = TRUE; static gboolean reduced_resources = FALSE; static gboolean gnome_accessibility = FALSE; @@ -159,7 +155,7 @@ static char *cursor_theme = NULL; static int cursor_size = 24; static gboolean border_effects = TRUE; -@@ -153,6 +155,7 @@ static gboolean update_workspace_name +@@ -168,6 +170,7 @@ const char *value); static gboolean update_reduced_resources (gboolean value); static gboolean update_gnome_accessibility (gboolean value); @@ -167,9 +163,9 @@ static gboolean update_cursor_theme (const char *value); static gboolean update_cursor_size (int size); static gboolean update_border_effects (gboolean value); -@@ -451,6 +454,11 @@ meta_prefs_init (void) - cleanup_error (&err); - update_gnome_accessibility (bool_val); +@@ -509,6 +512,11 @@ + if (get_bool (KEY_GNOME_ACCESSIBILITY, &bool_val)) + update_gnome_accessibility (bool_val); + bool_val = gconf_client_get_bool (default_client, KEY_ENABLE_WINDOWS_KEYS, + &err); @@ -179,7 +175,7 @@ str_val = gconf_client_get_string (default_client, KEY_CURSOR_THEME, &err); cleanup_error (&err); -@@ -969,6 +977,22 @@ change_notify (GConfClient *client, +@@ -1101,6 +1109,22 @@ if (update_horizontal_viewport_constraints (gconf_value_get_bool (value))) queue_changed (META_PREF_HORIZONTAL_VIEWPORT_CONSTRAINTS); } @@ -202,7 +198,7 @@ else { meta_topic (META_DEBUG_PREFS, "Key %s doesn't mean anything to Metacity\n", -@@ -1467,6 +1491,16 @@ update_disable_workarounds (gboolean val +@@ -1651,6 +1675,16 @@ return old != disable_workarounds; } @@ -219,9 +215,19 @@ #endif /* HAVE_GCONF */ gboolean -@@ -1635,6 +1669,11 @@ meta_preference_to_string (MetaPreferenc +@@ -1824,6 +1858,9 @@ case META_PREF_GNOME_ACCESSIBILITY: return "GNOME_ACCESSIBILTY"; + ++ case META_PREF_ENABLE_WINDOWS_KEYS: ++ return "ENABLE_WINDOWS_KEYS"; ++ + case META_PREF_BORDER_EFFECTS: + return "BORDER_EFFECTS"; + +@@ -2671,6 +2708,11 @@ + default: + key = g_strdup_printf (KEY_COMMAND_PREFIX"%d", i + 1); break; + + case META_PREF_ENABLE_WINDOWS_KEYS: @@ -231,7 +237,7 @@ case META_PREF_BORDER_EFFECTS: return "BORDER_EFFECTS"; break; -@@ -2371,6 +2410,12 @@ meta_prefs_get_reduced_resources (void) +@@ -2940,6 +2982,12 @@ } gboolean @@ -244,18 +250,17 @@ meta_prefs_get_gnome_accessibility () { return gnome_accessibility; -diff -uprN metacity-2.12.2-base/src/prefs.h metacity-2.12.2/src/prefs.h ---- metacity-2.12.2-base/src/prefs.h 2006-06-15 12:30:30.000000000 -0400 -+++ metacity-2.12.2/src/prefs.h 2006-06-15 12:31:59.000000000 -0400 -@@ -49,6 +49,7 @@ typedef enum +--- metacity-2.15.21/src/prefs.h ++++ metacity-2.15.21/src/prefs.h +@@ -52,6 +52,7 @@ META_PREF_VISUAL_BELL_TYPE, META_PREF_REDUCED_RESOURCES, META_PREF_GNOME_ACCESSIBILITY, + META_PREF_ENABLE_WINDOWS_KEYS, - META_PREF_RAISE_ON_CLICK, META_PREF_CURSOR_THEME, META_PREF_CURSOR_SIZE, -@@ -80,6 +81,7 @@ int meta_prefs_g + META_PREF_COMPOSITING_MANAGER, +@@ -85,6 +86,7 @@ gboolean meta_prefs_get_raise_on_click (void); gboolean meta_prefs_get_reduced_resources (void); gboolean meta_prefs_get_gnome_accessibility (void); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org