2.25.89 release.

svn path=/trunk/; revision=4066

ChangeLog

@@ -1,3 +1,69 @@
+2008-12-26  Thomas Thurman  <tthurman@gnome.org>
+
+        * NEWS: 2.25.89 release.
+
+2008-12-25  Thomas Thurman  <tthurman@gnome.org>
+
+	* src/include/all-keybindings.h: alt-F10 toggles maximisation,
+          alt-F5 only restores.  Also rename "unmaximize" to "restore".
+	* src/ui/frames.c: Rename "unmaximize" to "restore".
+          Closes #343824.
+
+2008-12-25  Frederic Peters  <fpeters@0d.be>
+
+	* src/core/main.c: (main): added call to g_thread_init(), as ORBit2
+	stopped doing it and Metacity is using gconf; closes #565517.
+
+2008-12-24  Yanko Kaneti  <yaneti@declera.com>
+
+	* src/metacity.schemas.in.in: add screenshot commands which had
+          mistakenly been removed; closes #564343, Launchpad bug 298463,
+          Red Hat bug 474635, and probably others.
+
+2008-12-24  Thomas Thurman  <tthurman@gnome.org>
+
+	* src/include/all-keybindings.h: fix move_to_corner_se
+
+2008-12-21  Colin Walters  <walters@verbum.org>
+
+	* src/core/window.c: windows which attempt to present themselves
+          but are offscreen end up demanding attention, unless they
+          are transient, when they move to the current workspace
+          as before.  Closes #482354.
+
+2008-12-19  Thomas Thurman  <tthurman@gnome.org>
+
+	* src/ui/frames.c: when the user double-clicks the title bar,
+	  end the grab op.  Closes #401028.
+
+2008-12-16  Thomas Thurman  <tthurman@gnome.org>
+
+        * configure.in: Post-release bump to 2.25.89.
+
+2008-12-16  Thomas Thurman  <tthurman@gnome.org>
+
+        * NEWS: 2.25.55 release.
+
+2008-12-15  Erwann Chenede  <erwann.chenede@sun.com>
+
+	* configure.in: fix build on Solaris.  Closes #564123.
+
+2008-12-02  Thomas Thurman  <tthurman@gnome.org>
+
+        * configure.in: Post-release bump to 2.25.55.
+
+2008-12-02  Thomas Thurman  <tthurman@gnome.org>
+
+        * NEWS: 2.25.34 release.
+
+2008-12-02  Matt Kraai  <kraai@ftbfs.org>
+
+	* src/core/iconcache.c: patches to fixes for -Wall.  Closes #562939.
+
+2008-12-01  Thomas Thurman  <tthurman@gnome.org>
+
+        * configure.in: Post-release bump to 2.25.34.
+
 2008-12-01  Thomas Thurman  <tthurman@gnome.org>
 
         * NEWS: 2.25.21 release.

NEWS

@@ -1,3 +1,41 @@
+2.25.89
+=======
+
+Thanks to Yanko Kaneti, Frederic Peters, Thomas Thurman, and Colin Walters for
+improvements in this version.
+
+  - The maximisation key is a toggle. (Thomas) (#343824)
+  - "Unmaximise" is now called "restore". (Thomas) (#343824)
+  - New thread handling call for gconf (Frederic) (#565517)
+  - Add screenshot commands back which had been removed (Yanko) (#565343)
+  - move_to_corner_se keybinding fixed (Thomas)
+  - Windows on other workspaces which attempt to present themselves
+    are marked as needing attention (Colin) (#482354)
+  - End the grab op when the user clicks the titlebar (Thomas) (#401028)
+
+Translations
+  Jorge González (es)
+
+2.25.55
+=======
+
+Thanks to Erwann Chenede for improvements in this version.
+
+  - Fix build on Solaris (Erwann) (#564123)
+
+Translations
+  Mattias Põldaru (et), Luca Ferretti (it)
+
+2.25.34
+=======
+
+Thanks to Matt Kraai for improvements in this version.
+
+  - Fixes to Thomas's earlier fixes (Matt) (#562939)
+
+Translations
+  None
+
 2.25.21
 =======
 

configure.in

@@ -4,7 +4,7 @@ m4_define([metacity_major_version], [2])
 m4_define([metacity_minor_version], [25])
 # Fibonacci sequence for micro version numbering:
 # 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
-m4_define([metacity_micro_version], [21])
+m4_define([metacity_micro_version], [89])
 
 m4_define([metacity_version],
           [metacity_major_version.metacity_minor_version.metacity_micro_version])
@@ -484,7 +484,9 @@ if test "x$enable_debug" = "xyes"; then
 fi
 
 # Warnings are there for a reason
-CFLAGS="$CFLAGS -Wall -Werror -ansi"
+if test "x$GCC" = "xyes"; then
+  CFLAGS="$CFLAGS -Wall -Werror -ansi"
+fi
 
 # Use gnome-doc-utils:
 GNOME_DOC_INIT([0.8.0])

po/ChangeLog

@@ -1,3 +1,15 @@
+2008-12-26  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
+
+	* es.po: Updated Spanish translation.
+
+2008-12-12  Luca Ferretti  <elle.uca@libero.it>
+
+	* it.po: Imported updated translation from gnome-2-24 branch.
+
+2008-12-08  Priit Laes  <plaes at svn dot gnome dot org>
+
+	* et.po: Translation updated by Mattias Põldaru
+
 2008-11-23  Jorge Gonzalez  <jorgegonz@svn.gnome.org>
 
 	* es.po: Updated Spanish translation

po/es.po

@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: metacity.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=metacity&component=general\n"
-"POT-Creation-Date: 2008-11-23 21:55+0000\n"
-"PO-Revision-Date: 2008-11-23 23:23+0100\n"
+"POT-Creation-Date: 2008-12-25 16:53+0000\n"
+"PO-Revision-Date: 2008-12-26 12:44+0100\n"
 "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -182,12 +182,12 @@ msgstr "Activar la composición"
 msgid "Turn compositing off"
 msgstr "Desactivar la composición"
 
-#: ../src/core/main.c:475
+#: ../src/core/main.c:478
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Falló al inspeccionar el directorio de temas: %s\n"
 
-#: ../src/core/main.c:491
+#: ../src/core/main.c:494
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -195,7 +195,7 @@ msgstr ""
 "No se ha podido encontrar un tema. Asegúrese de que %s existe y contiene los "
 "temas usuales.\n"
 
-#: ../src/core/main.c:547
+#: ../src/core/main.c:550
 #, c-format
 msgid "Failed to restart: %s\n"
 msgstr "No se pudo reiniciar: %s\n"
@@ -468,7 +468,7 @@ msgid "Metacity"
 msgstr "Metacity"
 
 #. first time through
-#: ../src/core/window.c:5728
+#: ../src/core/window.c:5743
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -484,7 +484,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:6293
+#: ../src/core/window.c:6308
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@@ -697,8 +697,8 @@ msgid "Maximize window"
 msgstr "Maximizar la ventana"
 
 #: ../src/include/all-keybindings.h:268
-msgid "Unmaximize window"
-msgstr "Desmaximizar la ventana"
+msgid "Restore window"
+msgstr "Restablecer la ventana"
 
 #: ../src/include/all-keybindings.h:270
 msgid "Toggle shaded state"
@@ -1139,6 +1139,25 @@ msgstr ""
 
 #: ../src/metacity.schemas.in.in.h:34
 msgid ""
+"The /apps/metacity/global_keybindings/run_command_screenshot key defines a "
+"keybinding which causes the command specified by this setting to be invoked."
+msgstr ""
+"La clave /apps/metacity/global_keybindings/run_command_screenshot define una "
+"combinación de teclas que hace que el comando especificado por esta "
+"configuración se invoque."
+
+#: ../src/metacity.schemas.in.in.h:35
+msgid ""
+"The /apps/metacity/global_keybindings/run_command_window_screenshot key "
+"defines a keybinding which causes the command specified by this setting to "
+"be invoked."
+msgstr ""
+"La clave /apps/metacity/global_keybindings/run_command_window_screenshot "
+"define una combinación de teclas que hace que el comando especificado por "
+"esta configuración se invoque."
+
+#: ../src/metacity.schemas.in.in.h:36
+msgid ""
 "The keybinding that runs the correspondingly-numbered command in /apps/"
 "metacity/keybinding_commands The format looks like \"&lt;Control&gt;a\" or "
 "\"&lt;Shift&gt;&lt;Alt&gt;F1\". The parser is fairly liberal and allows "
@@ -1153,11 +1172,15 @@ msgstr ""
 "Ctl&gt;» y «&lt;Ctrl&gt;». Si configura esta opción con la cadena especial "
 "«disabled» entonces no habrá combinación de teclas para esa acción."
 
-#: ../src/metacity.schemas.in.in.h:35
+#: ../src/metacity.schemas.in.in.h:37
 msgid "The name of a workspace."
 msgstr "El nombre de un área de trabajo."
 
-#: ../src/metacity.schemas.in.in.h:36
+#: ../src/metacity.schemas.in.in.h:38
+msgid "The screenshot command"
+msgstr "El comando de captura de pantalla"
+
+#: ../src/metacity.schemas.in.in.h:39
 msgid ""
 "The theme determines the appearance of window borders, titlebar, and so "
 "forth."
@@ -1165,7 +1188,7 @@ msgstr ""
 "El tema determina la apariencia de los bordes de la ventana, el título y "
 "demás."
 
-#: ../src/metacity.schemas.in.in.h:37
+#: ../src/metacity.schemas.in.in.h:40
 msgid ""
 "The time delay before raising a window if auto_raise is set to true. The "
 "delay is given in thousandths of a second."
@@ -1173,7 +1196,7 @@ msgstr ""
 "El retardo antes de desplegar una ventana si «auto_rise» está configurado "
 "como verdadero. El retardo está especificado en milésimas de segundo."
 
-#: ../src/metacity.schemas.in.in.h:38
+#: ../src/metacity.schemas.in.in.h:41
 msgid ""
 "The window focus mode indicates how windows are activated. It has three "
 "possible values; \"click\" means windows must be clicked in order to focus "
@@ -1188,7 +1211,11 @@ msgstr ""
 "foco cuando el ratón entra en la ventana y lo pierden cuando el ratón sale "
 "de la ventana."
 
-#: ../src/metacity.schemas.in.in.h:39
+#: ../src/metacity.schemas.in.in.h:42
+msgid "The window screenshot command"
+msgstr "El comando de captura de una ventana"
+
+#: ../src/metacity.schemas.in.in.h:43
 msgid ""
 "This option determines the effects of double-clicking on the title bar. "
 "Current valid options are 'toggle_shade', which will shade/unshade the "
@@ -1208,7 +1235,7 @@ msgstr ""
 "muestra la ventana de menú, «lower» que pone la ventana detrás de todas las "
 "demás y «none» que no hará nada."
 
-#: ../src/metacity.schemas.in.in.h:40
+#: ../src/metacity.schemas.in.in.h:44
 msgid ""
 "This option determines the effects of middle-clicking on the title bar. "
 "Current valid options are 'toggle_shade', which will shade/unshade the "
@@ -1228,7 +1255,7 @@ msgstr ""
 "muestra la ventana de menú, «lower» que pone la ventana detrás de todas las "
 "demás y «none» que no hará nada."
 
-#: ../src/metacity.schemas.in.in.h:41
+#: ../src/metacity.schemas.in.in.h:45
 msgid ""
 "This option determines the effects of right-clicking on the title bar. "
 "Current valid options are 'toggle_shade', which will shade/unshade the "
@@ -1248,7 +1275,7 @@ msgstr ""
 "muestra la ventana de menú, «lower» que pone la ventana detrás de todas las "
 "demás y «none» que no hará nada."
 
-#: ../src/metacity.schemas.in.in.h:42
+#: ../src/metacity.schemas.in.in.h:46
 msgid ""
 "This option provides additional control over how newly created windows get "
 "focus. It has two possible values; \"smart\" applies the user's normal focus "
@@ -1260,7 +1287,7 @@ msgstr ""
 "aplica el modo de foco normal del usuario, y «strict» hace que las ventanas "
 "iniciadas desde un terminal no se les dé el foco."
 
-#: ../src/metacity.schemas.in.in.h:43
+#: ../src/metacity.schemas.in.in.h:47
 msgid ""
 "Turns on a visual indication when an application or the system issues a "
 "'bell' or 'beep'; useful for the hard-of-hearing and for use in noisy "
@@ -1270,25 +1297,25 @@ msgstr ""
 "«campanada» o un «bip» ; es muy útil para los ambientes ruidosos y para las "
 "personas con dificultades auditivas."
 
-#: ../src/metacity.schemas.in.in.h:44
+#: ../src/metacity.schemas.in.in.h:48
 msgid "Use standard system font in window titles"
 msgstr "Usar tipografía estándar del sistema en los títulos de la ventana"
 
-#: ../src/metacity.schemas.in.in.h:45
+#: ../src/metacity.schemas.in.in.h:49
 msgid "Visual Bell Type"
 msgstr "Tipo de campana visual"
 
-#: ../src/metacity.schemas.in.in.h:46
+#: ../src/metacity.schemas.in.in.h:50
 msgid "Whether raising should be a side-effect of other user interactions"
 msgstr ""
 "Indica si elevar debe ser un efecto lateral de otras interacciones del "
 "usuario"
 
-#: ../src/metacity.schemas.in.in.h:47
+#: ../src/metacity.schemas.in.in.h:51
 msgid "Window focus mode"
 msgstr "Modo de foco de la ventana"
 
-#: ../src/metacity.schemas.in.in.h:48
+#: ../src/metacity.schemas.in.in.h:52
 msgid "Window title font"
 msgstr "Tipografía del título de la ventana"
 
@@ -1314,8 +1341,8 @@ msgid "Maximize Window"
 msgstr "Maximizar la ventana"
 
 #: ../src/ui/frames.c:1089
-msgid "Unmaximize Window"
-msgstr "Desmaximizar la ventana"
+msgid "Restore Window"
+msgstr "Restablecer la ventana"
 
 #: ../src/ui/frames.c:1092
 msgid "Roll Up Window"
@@ -2444,6 +2471,12 @@ msgstr ""
 "%d expresiones de coordenadas interpretadas en %g segundos (%g segundos de "
 "media)\n"
 
+#~ msgid "Unmaximize window"
+#~ msgstr "Desmaximizar la ventana"
+
+#~ msgid "Unmaximize Window"
+#~ msgstr "Desmaximizar la ventana"
+
 #~ msgid ""
 #~ "Many actions (e.g. clicking in the client area, moving or resizing the "
 #~ "window) normally raise the window as a side-effect. Setting this option "
@@ -2473,24 +2506,6 @@ msgstr ""
 #~ msgid "Unknown attribute %s on <geometry> element"
 #~ msgstr "Atributo desconocido %s en el elemento <geometry>"
 
-#~ msgid ""
-#~ "The /apps/metacity/global_keybindings/run_command_screenshot key defines "
-#~ "a keybinding which causes the command specified by this setting to be "
-#~ "invoked."
-#~ msgstr ""
-#~ "La clave /apps/metacity/global_keybindings/run_command_screenshot define "
-#~ "una combinación de teclas que hace que el comando especificado por esta "
-#~ "configuración se invoque."
-
-#~ msgid ""
-#~ "The /apps/metacity/global_keybindings/run_command_window_screenshot key "
-#~ "defines a keybinding which causes the command specified by this setting "
-#~ "to be invoked."
-#~ msgstr ""
-#~ "La clave /apps/metacity/global_keybindings/run_command_window_screenshot "
-#~ "define una combinación de teclas que hace que el comando especificado por "
-#~ "esta configuración se invoque."
-
 #~ msgid ""
 #~ "The keybinding that switches to the workspace above the current "
 #~ "workspace. The format looks like \"&lt;Control&gt;a\" or \"&lt;Shift&gt;"
@@ -3446,12 +3461,6 @@ msgstr ""
 #~ "Ctrl&gt;». Si configura esta opción con la cadena especial «disabled» "
 #~ "entonces no habrá combinación de teclas para esta acción."
 
-#~ msgid "The screenshot command"
-#~ msgstr "El comando de captura de pantalla"
-
-#~ msgid "The window screenshot command"
-#~ msgstr "El comando de captura de una ventana"
-
 #~ msgid ""
 #~ "This keybinding changes whether a window is above or below other windows. "
 #~ "If the window is covered by another one, it raises the window above all "

src/core/iconcache.c

@@ -230,7 +230,7 @@ read_rgb_icon (MetaDisplay   *display,
   int w, h;
   gulong *best_mini;
   int mini_w, mini_h;
-  gulong *data_as_long = (gulong*) data;
+  gulong *data_as_long;
 
   meta_error_trap_push_with_return (display);
   type = None;
@@ -253,6 +253,8 @@ read_rgb_icon (MetaDisplay   *display,
       return FALSE;
     }
 
+  data_as_long = (gulong *)data;
+
   if (!find_best_size (data_as_long, nitems,
                        ideal_width, ideal_height,
                        &w, &h, &best))
@@ -465,7 +467,7 @@ get_kwm_win_icon (MetaDisplay *display,
   gulong nitems;
   gulong bytes_after;
   guchar *data;
-  Pixmap *icons = (Pixmap*) icons;
+  Pixmap *icons;
   int err, result;
 
   *pixmap = None;
@@ -480,6 +482,7 @@ get_kwm_win_icon (MetaDisplay *display,
                                display->atom__KWM_WIN_ICON,
 			       &type, &format, &nitems,
 			       &bytes_after, &data);
+  icons = (Pixmap *)data;
 
   err = meta_error_trap_pop_with_return (display, TRUE);
   if (err != Success ||

src/core/main.c

@@ -375,6 +375,9 @@ main (int argc, char **argv)
     "Pango", "GLib-GObject", "GThread"
   };
   guint i;
+
+  if (!g_thread_supported ())
+    g_thread_init (NULL);
   
   if (setlocale (LC_ALL, "") == NULL)
     meta_warning ("Locale not understood by C library, internationalization will not work\n");

src/core/window.c

@@ -2952,8 +2952,23 @@ window_activate (MetaWindow     *window,
   /* Get window on current or given workspace */
   if (workspace == NULL)
     workspace = window->screen->active_workspace;
-  if (!meta_window_located_on_workspace (window, workspace))
-    meta_window_change_workspace (window, workspace);
+
+  /* For non-transient windows, we just set up a pulsing indicator, 
+     rather than move windows or workspaces.
+     See http://bugzilla.gnome.org/show_bug.cgi?id=482354 */
+  if (window->xtransient_for == None && 
+      !meta_window_located_on_workspace (window, workspace))
+    {
+      meta_window_set_demands_attention (window);
+      /* We've marked it as demanding, don't need to do anything else. */
+      return;
+    }
+  else if (window->xtransient_for != None)
+    {
+      /* Move transients to current workspace - preference dialogs should appear over 
+         the source window.  */
+      meta_window_change_workspace (window, workspace);
+    }
   
   if (window->shaded)
     meta_window_unshade (window, timestamp);

src/include/all-keybindings.h

@@ -258,14 +258,14 @@ keybind (activate_window_menu, handle_activate_window_menu, 0,
 keybind (toggle_fullscreen, handle_toggle_fullscreen, 0, BINDING_PER_WINDOW,
         NULL,
         _("Toggle fullscreen mode"))
-keybind (toggle_maximized, handle_toggle_maximized, 0, BINDING_PER_WINDOW, NULL,
+keybind (toggle_maximized, handle_toggle_maximized, 0, BINDING_PER_WINDOW, "<Alt>F10",
         _("Toggle maximization state"))
 keybind (toggle_above, handle_toggle_above, 0, BINDING_PER_WINDOW, NULL,
         _("Toggle whether a window will always be visible over other windows"))
-keybind (maximize, handle_maximize, 0, BINDING_PER_WINDOW, "<Alt>F10",
+keybind (maximize, handle_maximize, 0, BINDING_PER_WINDOW, NULL,
         _("Maximize window"))
 keybind (unmaximize, handle_unmaximize, 0, BINDING_PER_WINDOW, "<Alt>F5",
-        _("Unmaximize window"))
+        _("Restore window"))
 keybind (toggle_shaded, handle_toggle_shaded, 0, BINDING_PER_WINDOW, NULL,
         _("Toggle shaded state"))
 keybind (minimize, handle_minimize, 0, BINDING_PER_WINDOW, "<Alt>F9",
@@ -362,7 +362,7 @@ keybind (move_to_corner_ne, handle_move_to_corner_ne, 0,
 keybind (move_to_corner_sw, handle_move_to_corner_sw, 0,
         BINDING_PER_WINDOW, NULL,
         _("Move window to south-west (bottom left) corner"))
-keybind (move_to_corner_nw, handle_move_to_corner_se, 0,
+keybind (move_to_corner_se, handle_move_to_corner_se, 0,
         BINDING_PER_WINDOW, NULL,
         _("Move window to south-east (bottom right) corner"))
 

src/metacity.schemas.in.in

@@ -467,6 +467,38 @@
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/metacity/keybinding_commands/command_screenshot</key>
+      <applyto>/apps/metacity/keybinding_commands/command_screenshot</applyto>
+      <owner>metacity</owner>
+      <type>string</type>
+      <default>gnome-screenshot</default>
+      <locale name="C">
+         <short>The screenshot command</short>
+         <long>
+         The /apps/metacity/global_keybindings/run_command_screenshot
+         key defines a keybinding which causes the command specified
+         by this setting to be invoked.
+         </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/metacity/keybinding_commands/command_window_screenshot</key>
+      <applyto>/apps/metacity/keybinding_commands/command_window_screenshot</applyto>
+      <owner>metacity</owner>
+      <type>string</type>
+      <default>gnome-screenshot --window</default>
+      <locale name="C">
+         <short>The window screenshot command</short>
+         <long>
+         The /apps/metacity/global_keybindings/run_command_window_screenshot
+         key defines a keybinding which causes the command specified
+         by this setting to be invoked.
+         </long>
+      </locale>
+    </schema>
+
     <!-- Schemas below are generated by schema-bindings.c when this file
          becomes metacity.schemas.in     
     -->

src/ui/frames.c

@@ -1086,7 +1086,7 @@ show_tip_now (MetaFrames *frames)
       tiptext = _("Maximize Window");
       break;
     case META_FRAME_CONTROL_UNMAXIMIZE:
-      tiptext = _("Unmaximize Window");
+      tiptext = _("Restore Window");
       break;
     case META_FRAME_CONTROL_SHADE:
       tiptext = _("Roll Up Window");
@@ -1388,6 +1388,7 @@ meta_frames_button_press_event (GtkWidget      *widget,
       event->button == 1 &&
       event->type == GDK_2BUTTON_PRESS)
     {
+      meta_core_end_grab_op (gdk_display, event->time);
       return meta_frame_double_click_event (frame, event);
     }