Hello community, here is the log from the commit of package compiz checked in at Wed Jun 21 01:18:36 CEST 2006. -------- --- compiz/compiz.changes 2006-06-16 23:02:18.000000000 +0200 +++ compiz/compiz.changes 2006-06-20 17:28:15.000000000 +0200 @@ -1,0 +2,28 @@ +Tue Jun 20 17:24:43 CEST 2006 - danw@suse.de + +- Fix a mistranslation and a typo in de.po (186618) +- Add "Desktop Effects" to the po files where we have a translation + for "Desktop Effects:", to properly localize the capplet in the + control center. (179463) +- Break some very long lines in translations, fix a padding bug that + didn't show up with the English strings, remove a sizing hack + that causes the window to keep growing wider forever in zh_CN and + zh_TW. + +------------------------------------------------------------------- +Tue Jun 20 00:01:15 CEST 2006 - dreveman@suse.de + +- Trap errors correctly when getting motif hints. (bnc 185852) + +------------------------------------------------------------------- +Mon Jun 19 17:19:52 CEST 2006 - danw@suse.de + +- Add additional translations from localization team + +------------------------------------------------------------------- +Mon Jun 19 16:52:10 CEST 2006 - dreveman@suse.de + +- Use xkb state events to determine if modifier keys are released. + (bnc 184483) + +------------------------------------------------------------------- New: ---- 184483.diff compiz-i18n.patch gnome-xgl-settings-i18n-fixes.patch gnome-xgl-settings-i18n-more.patch mwm-error-trap.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.g7lQCe/_old 2006-06-21 01:18:30.000000000 +0200 +++ /var/tmp/diff_new_pack.g7lQCe/_new 2006-06-21 01:18:30.000000000 +0200 @@ -18,7 +18,7 @@ Requires: libpng libdrm gconf2 gtk2 gnome-desktop control-center2 libsvg libsvg-cairo libwnck xgl-hardware-list >= 060526 Autoreqprov: on Version: cvs_060616 -Release: 1 +Release: 2 Summary: OpenGL window and compositing manager. BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -34,6 +34,11 @@ Patch4: java-config-notify.diff Patch5: gnome-xgl-settings-install.patch Patch6: gnome-xgl-settings-i18n.patch +Patch7: 184483.diff +Patch8: gnome-xgl-settings-i18n-more.patch +Patch9: compiz-i18n.patch +Patch10: mwm-error-trap.diff +Patch11: gnome-xgl-settings-i18n-fixes.patch %description Compiz is an OpenGL compositing manager that use @@ -57,8 +62,13 @@ patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/compiz-audible-bell-off.patch patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/compiz-wobbly-off.patch patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/java-config-notify.diff +patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/184483.diff +patch -d compiz-0.0.13 -p1 < $RPM_SOURCE_DIR/compiz-i18n.patch +patch -d compiz-0.0.13 -p0 < $RPM_SOURCE_DIR/mwm-error-trap.diff patch -d gnome-xgl* -p0 < $RPM_SOURCE_DIR/gnome-xgl-settings-install.patch patch -d gnome-xgl* -p0 < $RPM_SOURCE_DIR/gnome-xgl-settings-i18n.patch +patch -d gnome-xgl* -p1 < $RPM_SOURCE_DIR/gnome-xgl-settings-i18n-more.patch +patch -d gnome-xgl* -p1 < $RPM_SOURCE_DIR/gnome-xgl-settings-i18n-fixes.patch %build PREFIX=/usr @@ -146,6 +156,22 @@ /etc/opt/gnome/gconf/schemas/compiz.schemas %changelog -n compiz +* Tue Jun 20 2006 - danw@suse.de +- Fix a mistranslation and a typo in de.po (186618) +- Add "Desktop Effects" to the po files where we have a translation + for "Desktop Effects:", to properly localize the capplet in the + control center. (179463) +- Break some very long lines in translations, fix a padding bug that + didn't show up with the English strings, remove a sizing hack + that causes the window to keep growing wider forever in zh_CN and + zh_TW. +* Tue Jun 20 2006 - dreveman@suse.de +- Trap errors correctly when getting motif hints. (bnc 185852) +* Mon Jun 19 2006 - danw@suse.de +- Add additional translations from localization team +* Mon Jun 19 2006 - dreveman@suse.de +- Use xkb state events to determine if modifier keys are released. + (bnc 184483) * Fri Jun 16 2006 - dreveman@suse.de - Handle motif WM hints correctly. (bnc 185852) - Add modal dialogs to window types that should be in switcher ++++++ 184483.diff ++++++ --- plugins/cube.c 15 Jun 2006 17:39:29 -0000 1.22 +++ plugins/cube.c 18 Jun 2006 22:40:10 -0000 @@ -1446,7 +1446,20 @@ damageScreen (s); } } + break; default: + if (event->type == d->xkbEvent) + { + s = d->screens; + if (s) + { + CUBE_SCREEN (s); + + if (eventTerminates (d, event, + &cs->opt[CUBE_SCREEN_OPTION_UNFOLD])) + cubeFold (s); + } + } break; } --- plugins/rotate.c 12 May 2006 11:54:05 -0000 1.18 +++ plugins/rotate.c 18 Jun 2006 22:40:11 -0000 @@ -1317,7 +1317,20 @@ handleEnterScreenEdge (s, event->xcrossing.window); } } + break; default: + if (event->type == d->xkbEvent) + { + s = d->screens; + if (s) + { + ROTATE_SCREEN (s); + + if (eventTerminates (d, event, + &rs->opt[ROTATE_SCREEN_OPTION_INITIATE])) + rotateTerminate (s); + } + } break; } --- plugins/switcher.c 16 Jun 2006 20:57:50 -0000 1.38 +++ plugins/switcher.c 18 Jun 2006 22:40:12 -0000 @@ -1107,7 +1107,21 @@ &ss->opt[SWITCH_SCREEN_OPTION_INITIATE])) switchTerminate (s, TRUE); } + break; default: + if (event->type == d->xkbEvent) + { + s = d->screens; + if (s) + { + SWITCH_SCREEN (s); + + if (ss->switching && + eventTerminates (d, event, + &ss->opt[SWITCH_SCREEN_OPTION_INITIATE])) + switchTerminate (s, TRUE); + } + } break; } --- plugins/water.c 23 May 2006 21:23:26 -0000 1.20 +++ plugins/water.c 18 Jun 2006 22:40:14 -0000 @@ -1405,6 +1405,8 @@ { XkbAnyEvent *xkbEvent = (XkbAnyEvent *) event; + s = d->screens; + if (xkbEvent->xkb_type == XkbBellNotify) { CompWindow *w; @@ -1435,6 +1437,20 @@ } } } + else if (s) + { + WATER_SCREEN (s); + + if (eventTerminates (d, event, + &ws->opt[WATER_SCREEN_OPTION_INITIATE])) + { + if (ws->grabIndex) + { + removeScreenGrab (s, ws->grabIndex, 0); + ws->grabIndex = 0; + } + } + } } break; } --- plugins/zoom.c 30 Apr 2006 13:00:05 -0000 1.9 +++ plugins/zoom.c 18 Jun 2006 22:40:14 -0000 @@ -621,7 +621,20 @@ damageScreen (s); } } + break; default: + if (event->type == d->xkbEvent) + { + s = d->screens; + if (s) + { + ZOOM_SCREEN (s); + + if (eventTerminates (d, event, + &zs->opt[ZOOM_SCREEN_OPTION_INITIATE])) + zoomTerminate (s); + } + } break; } --- src/display.c 7 Jun 2006 21:50:42 -0000 1.34 +++ src/display.c 18 Jun 2006 22:40:15 -0000 @@ -1979,8 +1979,8 @@ { XkbSelectEvents (dpy, XkbUseCoreKbd, - XkbBellNotifyMask, - XkbBellNotifyMask); + XkbBellNotifyMask | XkbStateNotifyMask, + XkbAllEventsMask); } else { --- src/event.c 9 Jun 2006 12:12:01 -0000 1.51 +++ src/event.c 18 Jun 2006 22:40:16 -0000 @@ -1646,7 +1646,22 @@ return (state & modMask & bindMods) != bindMods; default: + if (event->type == display->xkbEvent) + { + XkbAnyEvent *xkbEvent = (XkbAnyEvent *) event; + + if (xkbEvent->xkb_type == XkbStateNotify) + { + XkbStateNotifyEvent *stateEvent = (XkbStateNotifyEvent *) event; + + modMask = REAL_MOD_MASK & ~display->ignoredModMask; + bindMods = virtualToRealModMask (display, + bind->u.key.modifiers); + + return (stateEvent->mods & modMask & bindMods) != bindMods; + } + } + return FALSE; } } - ++++++ compiz-i18n.patch ++++++ ++++ 57756 lines (skipped) ++++++ gnome-xgl-settings-i18n-fixes.patch ++++++ --- gnome-xgl-settings-0.6/po/cs.po +++ gnome-xgl-settings-0.6/po/cs.po @@ -156,6 +156,9 @@ msgid "Desktop Effects:" msgstr "Efekty plochy:" +msgid "Desktop Effects" +msgstr "Efekty plochy" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "Nepovolovat překlápění hran." --- gnome-xgl-settings-0.6/po/de.po +++ gnome-xgl-settings-0.6/po/de.po @@ -140,7 +140,7 @@ #: ../xgl-settings/gnome-xgl-settings.glade.h:22 msgid "Control" -msgstr "Bedienelement" +msgstr "Strg" #: ../xgl-settings/gnome-xgl-settings.glade.h:23 msgid "Create ripples with the pointer when I hold down:" @@ -162,6 +162,9 @@ msgid "Desktop Effects:" msgstr "Desktop-Effekte:" +msgid "Desktop Effects" +msgstr "Desktop-Effekte" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "Kantenspiegelung nicht aktivieren" @@ -206,7 +209,7 @@ "Bottom Right" msgstr "" "Links oben\n" -"Rechts obent\n" +"Rechts oben\n" "Links unten\n" "Rechts unten" @@ -237,7 +240,7 @@ #: ../xgl-settings/gnome-xgl-settings.glade.h:46 msgid "Window edges stick to other windows when you hold down \"Shift\"" msgstr "" -"Die Fensterränder haften an anderen Fenstern, wenn Sie die Umschalttaste " +"Die Fensterränder haften an anderen Fenstern, wenn Sie die Umschalttaste\n" "gedrückt halten" #: ../xgl-settings/gnome-xgl-settings.glade.h:47 @@ -259,7 +262,7 @@ #: ../xgl-settings/gnome-xgl-settings.glade.h:51 msgid "Windows zoom to/from taskbar on minimize/unminimize." msgstr "" -"Allmähliche Vergrößerung/Verkleinerung zwischen Fenstern und Symbol in " +"Allmähliche Vergrößerung/Verkleinerung zwischen Fenstern und Symbol in\n" "Programmleiste bei Minimierung/Aufhebung der Minimierung" #. This is the beginning of the sentence "Wrap the desktop around a cube with ___ sides." It should end with a space. --- gnome-xgl-settings-0.6/po/es.po +++ gnome-xgl-settings-0.6/po/es.po @@ -174,6 +174,9 @@ msgid "Desktop Effects:" msgstr "Efectos de escritorio:" +msgid "Desktop Effects" +msgstr "Efectos de escritorio" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "No habilitar inversión de bordes." --- gnome-xgl-settings-0.6/po/fi.po +++ gnome-xgl-settings-0.6/po/fi.po @@ -164,6 +164,9 @@ msgid "Desktop Effects:" msgstr "Työpöytätehosteet:" +msgid "Desktop Effects" +msgstr "Työpöytätehosteet" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "Aktiiviset työpöydän reunat eivät ole käytössä." --- gnome-xgl-settings-0.6/po/fr.po +++ gnome-xgl-settings-0.6/po/fr.po @@ -176,6 +176,9 @@ msgid "Desktop Effects:" msgstr "Effets du bureau :" +msgid "Desktop Effects" +msgstr "Effets du bureau" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "Ne pas activer la rotation de côté." --- gnome-xgl-settings-0.6/po/hu.po +++ gnome-xgl-settings-0.6/po/hu.po @@ -156,6 +156,9 @@ msgid "Desktop Effects:" msgstr "Munkaasztal-effektus:" +msgid "Desktop Effects" +msgstr "Munkaasztal-effektus" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "Élforgatás mellőzése" --- gnome-xgl-settings-0.6/po/it.po +++ gnome-xgl-settings-0.6/po/it.po @@ -165,6 +165,9 @@ msgid "Desktop Effects:" msgstr "Effetti desktop:" +msgid "Desktop Effects" +msgstr "Effetti desktop" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "Non abilitare riflessione bordi." --- gnome-xgl-settings-0.6/po/ja.po +++ gnome-xgl-settings-0.6/po/ja.po @@ -157,6 +157,9 @@ msgid "Desktop Effects:" msgstr "デスクトップ効果:" +msgid "Desktop Effects" +msgstr "デスクトップ効果" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "エッジ反転を有効にしないでください。" --- gnome-xgl-settings-0.6/po/pl.po +++ gnome-xgl-settings-0.6/po/pl.po @@ -153,6 +153,9 @@ msgid "Desktop Effects:" msgstr "Efekty pulpitu:" +msgid "Desktop Effects" +msgstr "Efekty pulpitu" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "Wyłącz przełączanie krawędziami" @@ -247,7 +250,7 @@ msgid "Windows zoom to/from taskbar on minimize/unminimize." msgstr "" "Okna płynnie powiększają się z/pomniejszają się do paska zadań przy " -"minimalizacji i cofnięciu minimalizacji." +"minimalizacji\ni cofnięciu minimalizacji." #. This is the beginning of the sentence "Wrap the desktop around a cube with ___ sides." It should end with a space. #: ../xgl-settings/gnome-xgl-settings.glade.h:53 --- gnome-xgl-settings-0.6/po/pt_BR.po +++ gnome-xgl-settings-0.6/po/pt_BR.po @@ -155,6 +155,9 @@ msgid "Desktop Effects:" msgstr "Efeitos da Área de Trabalho:" +msgid "Desktop Effects" +msgstr "Efeitos da Área de Trabalho" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "Não habilitar inversão de bordas." --- gnome-xgl-settings-0.6/po/zh_CN.po +++ gnome-xgl-settings-0.6/po/zh_CN.po @@ -153,6 +153,9 @@ msgid "Desktop Effects:" msgstr "桌面效果:" +msgid "Desktop Effects" +msgstr "桌面效果" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "不启用边缘翻转。" --- gnome-xgl-settings-0.6/po/zh_TW.po +++ gnome-xgl-settings-0.6/po/zh_TW.po @@ -153,6 +153,9 @@ msgid "Desktop Effects:" msgstr "桌面特效:" +msgid "Desktop Effects" +msgstr "桌面特效" + #: ../xgl-settings/gnome-xgl-settings.glade.h:28 msgid "Don't enable edge flipping." msgstr "不要啟用邊緣翻轉。" --- gnome-xgl-settings-0.6/xgl-settings/gnome-xgl-settings.glade +++ gnome-xgl-settings-0.6/xgl-settings/gnome-xgl-settings.glade @@ -1920,8 +1920,6 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> </packing> </child> </widget> @@ -2125,7 +2123,6 @@ <property name="int1">0</property> <property name="int2">0</property> <property name="last_modification_time">Sun, 23 Apr 2006 01:58:24 GMT</property> - <signal name="size_allocate" handler="scale_key_size_allocate" last_modification_time="Sun, 23 Apr 2006 18:08:57 GMT"/> <signal name="changed" handler="scale_key_changed" last_modification_time="Sun, 23 Apr 2006 22:13:28 GMT"/> </widget> <packing> @@ -3023,6 +3020,7 @@ <property name="right_attach">1</property> <property name="top_attach">0</property> <property name="bottom_attach">1</property> + <property name="x_options">fill</property> <property name="y_options"></property> </packing> </child> @@ -3041,7 +3039,6 @@ <property name="right_attach">2</property> <property name="top_attach">0</property> <property name="bottom_attach">1</property> - <property name="x_options">fill</property> <property name="y_options">fill</property> </packing> </child> ++++++ gnome-xgl-settings-i18n-more.patch ++++++ ++++ 18050 lines (skipped) ++++++ mwm-error-trap.diff ++++++ --- gnome/window-decorator/gnome-window-decorator.c 16 Jun 2006 20:54:20 -0000 1.38 +++ gnome/window-decorator/gnome-window-decorator.c 19 Jun 2006 21:51:21 -0000 @@ -2335,19 +2335,25 @@ { Display *xdisplay; Atom actual; - int result, format; + int err, result, format; unsigned long n, left; MwmHints *mwm_hints; unsigned int decor = MWM_DECOR_ALL; xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()); + gdk_error_trap_push (); + result = XGetWindowProperty (xdisplay, xwindow, mwm_hints_atom, 0L, 20L, FALSE, mwm_hints_atom, &actual, &format, &n, &left, (unsigned char **) &mwm_hints); - if (result == Success && n && mwm_hints) + err = gdk_error_trap_pop (); + if (err != Success || result != Success) + return decor; + + if (n && mwm_hints) { if (n >= PROP_MOTIF_WM_HINT_ELEMENTS) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org