From aaea1a703050849cdf51170118189997920cda90 Mon Sep 17 00:00:00 2001 From: infirit Date: Fri, 11 Oct 2013 11:50:39 +0200 Subject: Update POTFILES.in with changed file name in libmatepanelapplet-4.0 port --- po/POTFILES.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 -- cgit v1.2.1 From df499f89bec731829f6b9adcf7376b0689a4adb2 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Tue, 22 Oct 2013 21:00:48 +0200 Subject: screenshot: do not segfault when taking a window picture with no delay --- mate-screenshot/mate-screenshot.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mate-screenshot/mate-screenshot.c b/mate-screenshot/mate-screenshot.c index f3db5794..77ceb3af 100644 --- a/mate-screenshot/mate-screenshot.c +++ b/mate-screenshot/mate-screenshot.c @@ -1368,8 +1368,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 (); -- cgit v1.2.1 From c6a883437343970fdf0c3035fd95fe34f3a8f5ad Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Tue, 5 Nov 2013 22:14:22 +0100 Subject: Fix Sun GNOME Documentation Team references --- gsearchtool/help/C/mate-search-tool.xml | 12 ++++++------ logview/help/C/mate-system-log.xml | 8 ++++---- logview/logview-about.h | 2 +- mate-dictionary/src/gdict-about.c | 2 +- 4 files changed, 12 insertions(+), 12 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 @@ &app; Manual V&manrevision; &date; - Sun MATE Documentation Team + Sun GNOME Documentation Team MATE Documentation Project @@ -129,7 +129,7 @@ &app; Manual V2.4 February 2004 - Sun MATE Documentation Team + Sun GNOME Documentation Team MATE Documentation Project @@ -137,7 +137,7 @@ &app; Manual V2.3 September 2002 - Sun MATE Documentation Team + Sun GNOME Documentation Team MATE Documentation Project @@ -145,7 +145,7 @@ &app;l Manual V2.2 August 2002 - Sun MATE Documentation Team + Sun GNOME Documentation Team MATE Documentation Project @@ -153,7 +153,7 @@ &app; Manual V2.1 July 2002 - Sun MATE Documentation Team + Sun GNOME Documentation Team MATE Documentation Project @@ -161,7 +161,7 @@ &app; Manual V2.0 May 2002 - Sun MATE Documentation Team + Sun GNOME Documentation Team MATE Documentation Project 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 @@ System Log Viewer Manual V2.3 October 2002 - Sun MATE Documentation Team + Sun GNOME Documentation Team gdocteam@sun.com MATE Documentation Project @@ -134,7 +134,7 @@ System Log Viewer Manual V2.2 August 2002 - Sun MATE Documentation Team + Sun GNOME Documentation Team gdocteam@sun.com MATE Documentation Project @@ -144,7 +144,7 @@ System Log Viewer Manual V2.1 July 2002 - Sun MATE Documentation Team + Sun GNOME Documentation Team gdocteam@sun.com MATE Documentation Project @@ -154,7 +154,7 @@ System Log Viewer Manual V2.0 May 2002 - Sun MATE Documentation Team + Sun GNOME Documentation Team gdocteam@sun.com MATE Documentation Project 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 ", + "Sun GNOME Documentation Team ", "Vincent Noel ", "Judith Samson ", 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 ", + "Sun GNOME Documentation Team ", "John Fleck ", "Emmanuele Bassi ", NULL -- cgit v1.2.1 From dc7123530e154dc4852c7f9900e693ecce5e2e2c Mon Sep 17 00:00:00 2001 From: raveit65 Date: Wed, 2 Oct 2013 20:23:11 +0200 Subject: disable masking for area or window screenshots --- mate-screenshot/mate-screenshot.c | 5 +++-- mate-screenshot/screenshot-utils.c | 9 +++++++-- mate-screenshot/screenshot-utils.h | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/mate-screenshot/mate-screenshot.c b/mate-screenshot/mate-screenshot.c index 77ceb3af..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]) { 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, -- cgit v1.2.1