Merge pull request #53 from flexiondotorg/1.6

Cherry picks from `master` for `mate-utils` 1.6

8 files changed, 38 insertions, 23 deletions

diff --git a/gsearchtool/help/C/mate-search-tool.xml b/gsearchtool/help/C/mate-search-tool.xml
index d1b94d7d..25533bab 100644
--- a/gsearchtool/help/C/mate-search-tool.xml
+++ b/gsearchtool/help/C/mate-search-tool.xml
@@ -100,7 +100,7 @@
 	<revnumber>&app; Manual V&manrevision;</revnumber> 
 	<date>&date;</date> 
 	<revdescription> 
-	  <para role="author">Sun MATE Documentation Team</para>
+	  <para role="author">Sun GNOME Documentation Team</para>
 	  <para role="publisher">MATE Documentation Project</para>
 	</revdescription> 
  </revision>
@@ -129,7 +129,7 @@
 			<revnumber>&app; Manual V2.4</revnumber> 
 			<date>February 2004</date> 
 			<revdescription> 
-	  		<para role="author">Sun MATE Documentation Team</para>
+	  		<para role="author">Sun GNOME Documentation Team</para>
 	  		<para role="publisher">MATE Documentation Project</para>
 			</revdescription> 
  </revision>
@@ -137,7 +137,7 @@
 			<revnumber>&app; Manual V2.3</revnumber> 
 			<date>September 2002</date> 
 			<revdescription> 
-	  		<para role="author">Sun MATE Documentation Team</para>
+	  		<para role="author">Sun GNOME Documentation Team</para>
 	  		<para role="publisher">MATE Documentation Project</para>
 			</revdescription> 
  </revision>
@@ -145,7 +145,7 @@
 			<revnumber>&app;l Manual V2.2</revnumber> 
 			<date>August 2002</date> 
 			<revdescription> 
-	  		<para role="author">Sun MATE Documentation Team</para>
+	  		<para role="author">Sun GNOME Documentation Team</para>
 	  		<para role="publisher">MATE Documentation Project</para>
 			</revdescription> 
  </revision> 
@@ -153,7 +153,7 @@
 			<revnumber>&app; Manual V2.1</revnumber> 
 			<date>July 2002</date> 
 			<revdescription> 
-	  		<para role="author">Sun MATE Documentation Team</para>
+	  		<para role="author">Sun GNOME Documentation Team</para>
 	  		<para role="publisher">MATE Documentation Project</para>
 			</revdescription> 
  </revision> 
@@ -161,7 +161,7 @@
 			<revnumber>&app; Manual V2.0</revnumber> 
 			<date>May 2002</date> 
 			<revdescription> 
-	  		<para role="author">Sun MATE Documentation Team</para>
+	  		<para role="author">Sun GNOME Documentation Team</para>
 	  		<para role="publisher">MATE Documentation Project</para>
 			</revdescription> 
  </revision> 
diff --git a/logview/help/C/mate-system-log.xml b/logview/help/C/mate-system-log.xml
index 11536ceb..ace6d5da 100644
--- a/logview/help/C/mate-system-log.xml
+++ b/logview/help/C/mate-system-log.xml
@@ -124,7 +124,7 @@
 		<revnumber>System Log Viewer Manual V2.3</revnumber> 
 		<date>October 2002</date> 
 		<revdescription> 
-	  		<para role="author">Sun MATE Documentation Team
+	  		<para role="author">Sun GNOME Documentation Team
 	    		<email>[email protected]</email>
 	  		</para>
 	  		<para role="publisher">MATE Documentation Project</para>
@@ -134,7 +134,7 @@
 		<revnumber>System Log Viewer Manual V2.2</revnumber> 
 		<date>August 2002</date> 
 		<revdescription> 
-	  		<para role="author">Sun MATE Documentation Team
+	  		<para role="author">Sun GNOME Documentation Team
 	    		<email>[email protected]</email>
 	  		</para>
 	  		<para role="publisher">MATE Documentation Project</para>
@@ -144,7 +144,7 @@
 		<revnumber>System Log Viewer Manual V2.1</revnumber> 
 		<date>July 2002</date> 
 		<revdescription> 
-	  		<para role="author">Sun MATE Documentation Team
+	  		<para role="author">Sun GNOME Documentation Team
 	    		<email>[email protected]</email>
 	  		</para>
 	  		<para role="publisher">MATE Documentation Project</para>
@@ -154,7 +154,7 @@
 		<revnumber>System Log Viewer Manual V2.0</revnumber> 
 		<date>May 2002</date> 
 		<revdescription> 
-	  		<para role="author">Sun MATE Documentation Team
+	  		<para role="author">Sun GNOME Documentation Team
 	    		<email>[email protected]</email>
 	  		</para>
 	  		<para role="publisher">MATE Documentation Project</para>
diff --git a/logview/logview-about.h b/logview/logview-about.h
index 5f32d877..9b4b0949 100644
--- a/logview/logview-about.h
+++ b/logview/logview-about.h
@@ -39,7 +39,7 @@ static const char *logview_about_authors[] = {
 };
 
 static const char *logview_about_documenters[] = {
-  "Sun MATE Documentation Team <[email protected]>",
+  "Sun GNOME Documentation Team <[email protected]>",
   "Vincent Noel <[email protected]>",
   "Judith Samson <[email protected]>",
   NULL
diff --git a/mate-dictionary/src/gdict-about.c b/mate-dictionary/src/gdict-about.c
index 20c5cb1d..00e61e25 100644
--- a/mate-dictionary/src/gdict-about.c
+++ b/mate-dictionary/src/gdict-about.c
@@ -46,7 +46,7 @@ gdict_show_about_dialog (GtkWidget *parent)
   };
 
   const gchar *documenters[] = {
-    "Sun MATE Documentation Team <[email protected]>",
+    "Sun GNOME Documentation Team <[email protected]>",
     "John Fleck <[email protected]>",
     "Emmanuele Bassi <[email protected]>",
     NULL
diff --git a/mate-screenshot/mate-screenshot.c b/mate-screenshot/mate-screenshot.c
index f3db5794..4243563f 100644
--- a/mate-screenshot/mate-screenshot.c
+++ b/mate-screenshot/mate-screenshot.c
@@ -809,13 +809,14 @@ static void
 finish_prepare_screenshot (char *initial_uri, GdkWindow *window, GdkRectangle *rectangle)
 {  
   ScreenshotDialog *dialog;
+  gboolean include_mask = (!take_window_shot && !take_area_shot);
 
   /* always disable window border for full-desktop or selected-area screenshots */
   if (!take_window_shot)
-    screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE);
+    screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, FALSE, include_mask);
   else
     {
-      screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border);
+      screenshot = screenshot_get_pixbuf (window, rectangle, include_pointer, include_border, include_mask);
 
       switch (border_effect[0])
         {
@@ -1368,8 +1369,17 @@ main (int argc, char *argv[])
     }
   else
     {
-      /* start this in an idle anyway and fire up the mainloop */
-      g_idle_add (prepare_screenshot_timeout, NULL);
+      if (interactive_arg)
+        {
+          /* HACK: give time to the dialog to actually disappear.
+           * We don't have any way to tell when the compositor has finished 
+           * re-drawing.
+           */
+          g_timeout_add (200,
+                         prepare_screenshot_timeout, NULL);
+        }
+      else
+        g_idle_add (prepare_screenshot_timeout, NULL);
     }
 
   gtk_main ();
diff --git a/mate-screenshot/screenshot-utils.c b/mate-screenshot/screenshot-utils.c
index b41ae4b8..faed6762 100644
--- a/mate-screenshot/screenshot-utils.c
+++ b/mate-screenshot/screenshot-utils.c
@@ -670,7 +670,8 @@ GdkPixbuf *
 screenshot_get_pixbuf (GdkWindow    *window,
                        GdkRectangle *rectangle,
                        gboolean      include_pointer,
-                       gboolean      include_border)
+                       gboolean      include_border,
+                       gboolean      include_mask)
 {
   GdkWindow *root;
   GdkPixbuf *screenshot;
@@ -738,7 +739,11 @@ screenshot_get_pixbuf (GdkWindow    *window,
                                              x_orig, y_orig, 0, 0,
                                              width, height);
 
-  mask_monitors (screenshot, root);
+  /*
+   * Masking currently only works properly with full-screen shots
+   */
+  if (include_mask)
+      mask_monitors (screenshot, root);
 
 #ifdef HAVE_X11_EXTENSIONS_SHAPE_H
   if (include_border)
diff --git a/mate-screenshot/screenshot-utils.h b/mate-screenshot/screenshot-utils.h
index 0af2ba39..5404bde4 100644
--- a/mate-screenshot/screenshot-utils.h
+++ b/mate-screenshot/screenshot-utils.h
@@ -36,7 +36,8 @@ gboolean   screenshot_select_area         (int *px,
 GdkPixbuf *screenshot_get_pixbuf          (GdkWindow *win,
                                            GdkRectangle *rectangle,
                                            gboolean include_pointer,
-                                           gboolean include_border);
+                                           gboolean include_border,
+                                           gboolean include_mask);
 
 void       screenshot_show_error_dialog   (GtkWindow   *parent,
                                            const gchar *message,
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4b15b4af..94defaa7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -14,12 +14,9 @@ baobab/src/baobab-utils.c
 baobab/src/baobab-ringschart.c
 baobab/src/callbacks.c
 mate-dictionary/data/default.desktop.in
-mate-dictionary/data/MATE_DictionaryApplet.server.in.in
-mate-dictionary/data/MATE_DictionaryApplet.xml
 mate-dictionary/data/mate-dictionary.desktop.in.in
 mate-dictionary/data/org.mate.dictionary.gschema.xml.in
-[type: gettext/glade]mate-dictionary/data/mate-dictionary-preferences.ui
-[type: gettext/glade]mate-dictionary/data/mate-dictionary-source.ui
+mate-dictionary/data/org.mate.panel.applet.DictionaryAppletFactory.service.in
 mate-dictionary/data/spanish.desktop.in
 mate-dictionary/data/thai.desktop.in
 mate-dictionary/libgdict/gdict-client-context.c
@@ -43,6 +40,8 @@ mate-dictionary/src/gdict-sidebar.c
 mate-dictionary/src/gdict-source-dialog.c
 mate-dictionary/src/gdict-window.c
 mate-dictionary/src/main.c
+[type: gettext/glade]mate-dictionary/data/mate-dictionary-preferences.ui
+[type: gettext/glade]mate-dictionary/data/mate-dictionary-source.ui
 mate-screenshot/mate-screenshot.c
 mate-screenshot/mate-screenshot.desktop.in
 [type: gettext/glade]mate-screenshot/mate-screenshot.ui