11 files changed, 26 insertions, 42 deletions
diff --git a/mate-screenshot/src/mate-screenshot.c b/mate-screenshot/src/mate-screenshot.c
index c888d4d7..9786c994 100644
--- a/mate-screenshot/src/mate-screenshot.c
+++ b/mate-screenshot/src/mate-screenshot.c
@@ -1,6 +1,7 @@
 /* Copyright (C) 2001 Jonathan Blandford <[email protected]>
  * Copyright (C) 2006 Emmanuele Bassi <[email protected]>
  * Copyright (C) 2008 Cosimo Cecchi <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
  *
  * This file is part of MATE Utils.
  *
@@ -31,7 +32,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
+#ifdef ENABLE_NLS
 #include <locale.h>
+#endif /* ENABLE_NLS */
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <pwd.h>
@@ -537,7 +540,7 @@ create_interactive_dialog (void)
                     G_CALLBACK (interactive_dialog_response_cb),
                     NULL);
 
-  g_signal_connect (G_OBJECT (retval), "key-press-event",
+  g_signal_connect (retval, "key-press-event",
                     G_CALLBACK(key_press_cb),
                     NULL);
 
@@ -757,7 +760,6 @@ screenshot_dialog_response_cb (GtkDialog *d,
     }
 }
 
-
 static void
 run_dialog (ScreenshotDialog *dialog)
 {
@@ -1110,7 +1112,6 @@ prepare_screenshot_timeout (gpointer data)
   return FALSE;
 }
 
-
 static gchar *
 get_desktop_dir (void)
 {
@@ -1177,8 +1178,10 @@ load_options (void)
   /* Find various dirs */
   last_save_dir = g_settings_get_string (settings,
                                          LAST_SAVE_DIRECTORY_KEY);
-  if (!last_save_dir || !last_save_dir[0])
+
+  if (*last_save_dir == '\0')
     {
+      g_free (last_save_dir);
       last_save_dir = get_desktop_dir ();
     }
   else if (last_save_dir[0] == '~')
@@ -1214,36 +1217,6 @@ save_options (void)
                          BORDER_EFFECT_KEY, border_effect);
 }
 
-
-static void
-register_screenshooter_icon (GtkIconFactory * factory)
-{
-  GtkIconSource *source;
-  GtkIconSet *icon_set;
-
-  source = gtk_icon_source_new ();
-  gtk_icon_source_set_icon_name (source, SCREENSHOOTER_ICON);
-
-  icon_set = gtk_icon_set_new ();
-  gtk_icon_set_add_source (icon_set, source);
-
-  gtk_icon_factory_add (factory, SCREENSHOOTER_ICON, icon_set);
-  gtk_icon_set_unref (icon_set);
-  gtk_icon_source_free (source);
-}
-
-static void
-screenshooter_init_stock_icons (void)
-{
-  GtkIconFactory *factory;
-
-  factory = gtk_icon_factory_new ();
-  gtk_icon_factory_add_default (factory);
-
-  register_screenshooter_icon (factory);
-  g_object_unref (factory);
-}
-
 void
 loop_dialog_screenshot (void)
 {
@@ -1318,13 +1291,15 @@ main (int argc, char *argv[])
     { "border-effect", 'e', 0, G_OPTION_ARG_STRING, &border_effect_arg, N_("Effect to add to the border (shadow, border or none)"), N_("effect") },
     { "interactive", 'i', 0, G_OPTION_ARG_NONE, &interactive_arg, N_("Interactively set options"), NULL },
     { "version", 0, 0, G_OPTION_ARG_NONE, &version_arg, N_("Print version information and exit"), NULL },
-    { NULL },
+    { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL },
   };
 
+#ifdef ENABLE_NLS
   setlocale (LC_ALL, "");
   bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 
   context = g_option_context_new (_("Take a picture of the screen"));
   g_option_context_set_ignore_unknown_options (context, FALSE);
@@ -1361,7 +1336,6 @@ main (int argc, char *argv[])
   }
 
   gtk_window_set_default_icon_name (SCREENSHOOTER_ICON);
-  screenshooter_init_stock_icons ();
 
   settings = g_settings_new (MATE_SCREENSHOT_SCHEMA);
   load_options ();
diff --git a/mate-screenshot/src/screenshot-dialog.c b/mate-screenshot/src/screenshot-dialog.c
index 40ce7125..cd1afeb2 100644
--- a/mate-screenshot/src/screenshot-dialog.c
+++ b/mate-screenshot/src/screenshot-dialog.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2001-2006 Jonathan Blandford <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
  *
  * This file is part of MATE Utils.
  *
@@ -166,7 +167,6 @@ drag_begin (GtkWidget        *widget,
 			    dialog->drag_x, dialog->drag_y);
 }
 
-
 ScreenshotDialog *
 screenshot_dialog_new (GdkPixbuf *screenshot,
 		       char      *initial_uri,
@@ -253,10 +253,12 @@ screenshot_dialog_new (GdkPixbuf *screenshot,
     gtk_frame_set_shadow_type (GTK_FRAME (aspect_frame), GTK_SHADOW_IN);
 
   /* setup dnd */
-  g_signal_connect (G_OBJECT (preview_darea), "drag_begin",
-		    G_CALLBACK (drag_begin), dialog);
-  g_signal_connect (G_OBJECT (preview_darea), "drag_data_get",
-		    G_CALLBACK (drag_data_get), dialog);
+  g_signal_connect (preview_darea, "drag_begin",
+                    G_CALLBACK (drag_begin),
+                    dialog);
+  g_signal_connect (preview_darea, "drag_data_get",
+                    G_CALLBACK (drag_data_get),
+                    dialog);
 
   gtk_widget_show_all (toplevel);
 
diff --git a/mate-screenshot/src/screenshot-dialog.h b/mate-screenshot/src/screenshot-dialog.h
index cf2a8186..40108a31 100644
--- a/mate-screenshot/src/screenshot-dialog.h
+++ b/mate-screenshot/src/screenshot-dialog.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2001-2006 Jonathan Blandford <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
  *
  * This file is part of MATE Utils.
  *
diff --git a/mate-screenshot/src/screenshot-save.c b/mate-screenshot/src/screenshot-save.c
index 59b455c4..1acf898f 100644
--- a/mate-screenshot/src/screenshot-save.c
+++ b/mate-screenshot/src/screenshot-save.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2001-2006 Jonathan Blandford <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
  *
  * This file is part of MATE Utils.
  *
diff --git a/mate-screenshot/src/screenshot-save.h b/mate-screenshot/src/screenshot-save.h
index 0b12b8ad..3db39631 100644
--- a/mate-screenshot/src/screenshot-save.h
+++ b/mate-screenshot/src/screenshot-save.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2001-2006 Jonathan Blandford <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
  *
  * This file is part of MATE Utils.
  *
diff --git a/mate-screenshot/src/screenshot-shadow.c b/mate-screenshot/src/screenshot-shadow.c
index cecdfd4a..dfef5edf 100644
--- a/mate-screenshot/src/screenshot-shadow.c
+++ b/mate-screenshot/src/screenshot-shadow.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2001-2006 Jonathan Blandford <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
  *
  * This file is part of MATE Utils.
  *
diff --git a/mate-screenshot/src/screenshot-shadow.h b/mate-screenshot/src/screenshot-shadow.h
index 1b31e564..16c16e3a 100644
--- a/mate-screenshot/src/screenshot-shadow.h
+++ b/mate-screenshot/src/screenshot-shadow.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2001-2006 Jonathan Blandford <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
  *
  * This file is part of MATE Utils.
  *
diff --git a/mate-screenshot/src/screenshot-utils.c b/mate-screenshot/src/screenshot-utils.c
index 568c24c7..6ee457c9 100644
--- a/mate-screenshot/src/screenshot-utils.c
+++ b/mate-screenshot/src/screenshot-utils.c
@@ -1,5 +1,6 @@
 /* Copyright (C) 2001-2006 Jonathan Blandford <[email protected]>
  * Copyright (C) 2008 Cosimo Cecchi <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
  *
  * This file is part of MATE Utils.
  *
@@ -313,7 +314,6 @@ select_area_key_press (GtkWidget *window,
   return TRUE;
 }
 
-
 static gboolean
 draw (GtkWidget *window, cairo_t *cr, gpointer unused)
 {
diff --git a/mate-screenshot/src/screenshot-utils.h b/mate-screenshot/src/screenshot-utils.h
index 1a63ae85..0b7e5700 100644
--- a/mate-screenshot/src/screenshot-utils.h
+++ b/mate-screenshot/src/screenshot-utils.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2001-2006 Jonathan Blandford <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
  *
  * This file is part of MATE Utils.
  *
diff --git a/mate-screenshot/src/screenshot-xfer.c b/mate-screenshot/src/screenshot-xfer.c
index 4bb1dda2..66aff329 100644
--- a/mate-screenshot/src/screenshot-xfer.c
+++ b/mate-screenshot/src/screenshot-xfer.c
@@ -1,5 +1,6 @@
 /* Copyright (C) 2001-2006 Jonathan Blandford <[email protected]>
  * Copyright (C) 2008 Cosimo Cecchi <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
  *
  * This file is part of MATE Utils.
  *
diff --git a/mate-screenshot/src/screenshot-xfer.h b/mate-screenshot/src/screenshot-xfer.h
index 0d172c29..df4a6bb2 100644
--- a/mate-screenshot/src/screenshot-xfer.h
+++ b/mate-screenshot/src/screenshot-xfer.h
@@ -1,5 +1,6 @@
 /* Copyright (C) 2001-2006 Jonathan Blandford <[email protected]>
  * Copyright (C) 2008 Cosimo Cecchi <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
  *
  * This file is part of MATE Utils.
  *