23 files changed, 56 insertions, 41 deletions
diff --git a/baobab/src/Makefile.am b/baobab/src/Makefile.am
index aa50eaa0..e6e34268 100644
--- a/baobab/src/Makefile.am
+++ b/baobab/src/Makefile.am
@@ -62,6 +62,7 @@ mate_disk_usage_analyzer_CFLAGS = \
 $(GIO_CFLAGS) \
 $(GTK_CFLAGS) \
 $(LIBGTOP_CFLAGS) \
+ $(MATE_DESKTOP_CFLAGS) \
 $(WARN_CFLAGS) \
 $(NULL)
 
@@ -72,6 +73,7 @@ mate_disk_usage_analyzer_LDADD = \
 $(GIO_LIBS) \
 $(GTK_LIBS) \
 $(LIBGTOP_LIBS) \
+ $(MATE_DESKTOP_LIBS) \
 $(NULL)
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/baobab/src/baobab-cell-renderer-progress.c b/baobab/src/baobab-cell-renderer-progress.c
index 7b7a3a8c..de7bb733 100644
--- a/baobab/src/baobab-cell-renderer-progress.c
+++ b/baobab/src/baobab-cell-renderer-progress.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2006 Paolo Borelli
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab-cell-renderer-progress.h b/baobab/src/baobab-cell-renderer-progress.h
index f437ee51..2b79d682 100644
--- a/baobab/src/baobab-cell-renderer-progress.h
+++ b/baobab/src/baobab-cell-renderer-progress.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2006 Paolo Borelli
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab-chart.c b/baobab/src/baobab-chart.c
index ada9d030..d8350511 100644
--- a/baobab/src/baobab-chart.c
+++ b/baobab/src/baobab-chart.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2006, 2007, 2008 Igalia
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
@@ -166,7 +167,6 @@ static gboolean baobab_chart_query_tooltip (GtkWidget *widget,
 GtkTooltip *tooltip,
 gpointer user_data);
 
-
 static void
 baobab_chart_class_init (BaobabChartClass *class)
 {
@@ -522,8 +522,6 @@ baobab_chart_get_items (GtkWidget *chart, GtkTreePath *root)
 return;
 }
 
-
-
 model_root_path = gtk_tree_path_new_first ();
 gtk_tree_model_get_iter (priv->model, &model_root_iter, model_root_path);
 gtk_tree_path_free (model_root_path);
@@ -656,7 +654,6 @@ baobab_chart_update_draw (BaobabChart* chart,
 if (priv->root == NULL)
 root_path = gtk_tree_path_new_first ();
 
-
 root_depth = gtk_tree_path_get_depth (root_path);
 node_depth = gtk_tree_path_get_depth (path);
 
@@ -1170,7 +1167,7 @@ baobab_chart_query_tooltip (GtkWidget *widget,
 return TRUE;
 }
 
-GdkPixbuf*
+static GdkPixbuf*
 baobab_chart_get_pixbuf (GtkWidget *widget)
 {
 gint w, h;
@@ -1181,7 +1178,6 @@ baobab_chart_get_pixbuf (GtkWidget *widget)
 w = gdk_window_get_width(gtk_widget_get_window(widget));
 h = gdk_window_get_height(gtk_widget_get_window(widget));
 
-
 pixbuf = gdk_pixbuf_get_from_window (
 gtk_widget_get_window (widget),
 0, 0,
diff --git a/baobab/src/baobab-chart.h b/baobab/src/baobab-chart.h
index 00bdac50..ad82a429 100644
--- a/baobab/src/baobab-chart.h
+++ b/baobab/src/baobab-chart.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2006, 2007, 2008 Igalia
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab-prefs.c b/baobab/src/baobab-prefs.c
index d7084f59..ef40e96f 100644
--- a/baobab/src/baobab-prefs.c
+++ b/baobab/src/baobab-prefs.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab-prefs.h b/baobab/src/baobab-prefs.h
index 9903cfda..cb90a545 100644
--- a/baobab/src/baobab-prefs.h
+++ b/baobab/src/baobab-prefs.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab-remote-connect-dialog.c b/baobab/src/baobab-remote-connect-dialog.c
index 11b5892f..484ffbf5 100644
--- a/baobab/src/baobab-remote-connect-dialog.c
+++ b/baobab/src/baobab-remote-connect-dialog.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005 Fabio Marzocca
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * Modified module from caja-connect-server-dialog.c.
 * Released under same licence.
@@ -33,7 +34,6 @@
 
 #include "baobab.h"
 
-
 /* Translators: all the strings in this file are meant to map the
 similar strings inside caja-connect-server and should be
 translated the same way
@@ -55,7 +55,6 @@ G_DEFINE_TYPE(BaobabRemoteConnectDialog, baobab_remote_connect_dialog, GTK_TYPE_
 
 #define RESPONSE_CONNECT GTK_RESPONSE_OK
 
-
 static void
 display_error_dialog (GError *error,
 GFile *location,
@@ -63,24 +62,18 @@ display_error_dialog (GError *error,
 {
 GtkWidget *dlg;
 char *parse_name;
- char *error_message;
 
 parse_name = g_file_get_parse_name (location);
- error_message = g_strdup_printf (_("Cannot scan location \"%s\""),
- parse_name);
- g_free (parse_name);
-
 dlg = gtk_message_dialog_new (parent,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- error_message, NULL);
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("Cannot scan location \"%s\""), parse_name);
+ g_free (parse_name);
 
 gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dlg),
 "%s", error->message);
 
- g_free (error_message);
-
 gtk_dialog_run (GTK_DIALOG (dlg));
 gtk_widget_destroy (dlg);
 }
@@ -652,7 +645,6 @@ baobab_remote_connect_dialog_init (BaobabRemoteConnectDialog *dialog)
 1, get_method_description (&(methods[i])),
 -1);
 
-
 if (methods[i].flags & DEFAULT_METHOD) {
 gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
 }
@@ -681,7 +673,6 @@ baobab_remote_connect_dialog_init (BaobabRemoteConnectDialog *dialog)
 gtk_box_pack_start (GTK_BOX (hbox),
 label, FALSE, FALSE, 0);
 
-
 dialog->details->grid = grid = gtk_grid_new ();
 gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
 gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
diff --git a/baobab/src/baobab-remote-connect-dialog.h b/baobab/src/baobab-remote-connect-dialog.h
index 486a7804..06e4e9d9 100644
--- a/baobab/src/baobab-remote-connect-dialog.h
+++ b/baobab/src/baobab-remote-connect-dialog.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005 Fabio Marzocca
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * Modified module from BaobabRemoteConnectDialog.h.
 * Released under same licence.
diff --git a/baobab/src/baobab-ringschart.c b/baobab/src/baobab-ringschart.c
index 38461c5b..7b568673 100644
--- a/baobab/src/baobab-ringschart.c
+++ b/baobab/src/baobab-ringschart.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2008 Igalia
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
@@ -95,7 +96,6 @@ static void baobab_ringschart_get_item_rectangle (GtkWidget *chart,
 static void baobab_ringschart_pre_draw (GtkWidget *chart, cairo_t *cr);
 static void baobab_ringschart_post_draw (GtkWidget *chart, cairo_t *cr);
 
-
 static void
 baobab_ringschart_class_init (BaobabRingschartClass *class)
 {
@@ -363,7 +363,7 @@ baobab_ringschart_get_item_rectangle (GtkWidget *chart,
 item->rect = rect;
 }
 
-gboolean
+static gboolean
 baobab_ringschart_subfolder_tips_timeout (gpointer data)
 {
 BaobabRingschartPrivate *priv;
@@ -377,7 +377,7 @@ baobab_ringschart_subfolder_tips_timeout (gpointer data)
 return FALSE;
 }
 
-void
+static void
 baobab_ringschart_clean_subforlder_tips_state (GtkWidget *chart)
 {
 BaobabRingschartPrivate *priv;
diff --git a/baobab/src/baobab-ringschart.h b/baobab/src/baobab-ringschart.h
index a13b0134..1e257778 100644
--- a/baobab/src/baobab-ringschart.h
+++ b/baobab/src/baobab-ringschart.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2008 igalia
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab-scan.c b/baobab/src/baobab-scan.c
index 9d8a1143..f79b9223 100644
--- a/baobab/src/baobab-scan.c
+++ b/baobab/src/baobab-scan.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
@@ -28,7 +29,7 @@
 
 #include "baobab.h"
 #include "baobab-utils.h"
-
+#include "baobab-scan.h"
 
 /*
 Hardlinks handling.
@@ -141,7 +142,6 @@ static const char *dir_attributes = \
 G_FILE_ATTRIBUTE_UNIX_DEVICE "," \
 G_FILE_ATTRIBUTE_ACCESS_CAN_READ;
 
-
 static gboolean
 is_in_dot_gvfs (GFile *file)
 {
diff --git a/baobab/src/baobab-scan.h b/baobab/src/baobab-scan.h
index f178ca2a..c687944a 100644
--- a/baobab/src/baobab-scan.h
+++ b/baobab/src/baobab-scan.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab-treemap.c b/baobab/src/baobab-treemap.c
index dea75c05..966caddf 100644
--- a/baobab/src/baobab-treemap.c
+++ b/baobab/src/baobab-treemap.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2008 Igalia
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab-treemap.h b/baobab/src/baobab-treemap.h
index 4057a9e5..f2b38d84 100644
--- a/baobab/src/baobab-treemap.h
+++ b/baobab/src/baobab-treemap.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2008 igalia
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab-treeview.c b/baobab/src/baobab-treeview.c
index fe3d6bf2..50794773 100644
--- a/baobab/src/baobab-treeview.c
+++ b/baobab/src/baobab-treeview.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab-treeview.h b/baobab/src/baobab-treeview.h
index 42087027..62e85384 100644
--- a/baobab/src/baobab-treeview.h
+++ b/baobab/src/baobab-treeview.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab-utils.c b/baobab/src/baobab-utils.c
index 9ef02582..43efd3fb 100644
--- a/baobab/src/baobab-utils.c
+++ b/baobab/src/baobab-utils.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
@@ -32,6 +33,8 @@
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
 
+#include <libmate-desktop/mate-image-menu-item.h>
+
 #include "baobab.h"
 #include "baobab-treeview.h"
 #include "baobab-utils.h"
@@ -69,7 +72,7 @@ baobab_get_filesystem (BaobabFS *fs)
 g_free (mountentries);
 }
 
-void
+static void
 filechooser_cb (GtkWidget *chooser,
 gint response,
 gpointer data)
@@ -322,9 +325,9 @@ add_popupmenu_item (GtkMenu *pmenu, const gchar *label, const gchar *icon_name,
 GtkWidget *item;
 GtkWidget *image;
 
- item = gtk_image_menu_item_new_with_mnemonic (label);
+ item = mate_image_menu_item_new_with_mnemonic (label);
 image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item), image);
+ mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (item), image);
 
 g_signal_connect (item, "activate", item_cb, NULL);
 
@@ -497,8 +500,9 @@ baobab_help_display (GtkWindow *parent,
 gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 "%s", error->message);
 
- g_signal_connect (G_OBJECT (dialog), "response",
- G_CALLBACK (gtk_widget_destroy), NULL);
+ g_signal_connect (dialog, "response",
+ G_CALLBACK (gtk_widget_destroy),
+ NULL);
 
 gtk_widget_show (dialog);
 
diff --git a/baobab/src/baobab-utils.h b/baobab/src/baobab-utils.h
index c9e07a02..679d530b 100644
--- a/baobab/src/baobab-utils.h
+++ b/baobab/src/baobab-utils.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c
index 1b942dea..380f5407 100644
--- a/baobab/src/baobab.c
+++ b/baobab/src/baobab.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
@@ -25,6 +26,8 @@
 #include <gio/gio.h>
 #include <glibtop.h>
 
+#include <libmate-desktop/mate-image-menu-item.h>
+
 #include "baobab.h"
 #include "baobab-scan.h"
 #include "baobab-treeview.h"
@@ -909,20 +912,20 @@ create_context_menu (void)
 
 menu->widget = gtk_menu_new ();
 
- menu->up_item = gtk_image_menu_item_new_with_label (_("Move to parent folder"));
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu->up_item),
+ menu->up_item = mate_image_menu_item_new_with_label (_("Move to parent folder"));
+ mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (menu->up_item),
 gtk_image_new_from_icon_name("go-up", GTK_ICON_SIZE_MENU));
 
- menu->zoom_in_item = gtk_image_menu_item_new_with_label (_("Zoom in")) ;
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu->zoom_in_item),
+ menu->zoom_in_item = mate_image_menu_item_new_with_label (_("Zoom in")) ;
+ mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (menu->zoom_in_item),
 gtk_image_new_from_icon_name("list-add", GTK_ICON_SIZE_MENU));
 
- menu->zoom_out_item = gtk_image_menu_item_new_with_label (_("Zoom out"));
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu->zoom_out_item),
+ menu->zoom_out_item = mate_image_menu_item_new_with_label (_("Zoom out"));
+ mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (menu->zoom_out_item),
 gtk_image_new_from_icon_name("list-remove", GTK_ICON_SIZE_MENU));
 
- menu->snapshot_item = gtk_image_menu_item_new_with_label (_("Save screenshot"));
- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu->snapshot_item),
+ menu->snapshot_item = mate_image_menu_item_new_with_label (_("Save screenshot"));
+ mate_image_menu_item_set_image (MATE_IMAGE_MENU_ITEM (menu->snapshot_item),
 gtk_image_new_from_icon_name ("applets-screenshooter", GTK_ICON_SIZE_MENU));
 
 gtk_menu_shell_append (GTK_MENU_SHELL (menu->widget),
@@ -1222,14 +1225,16 @@ main (int argc, char *argv[])
 const GOptionEntry options[] = {
 {"version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, show_version, N_("Show version"), NULL},
 {G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &directories, NULL, N_("[DIRECTORY]")},
- {NULL}
+ { NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL }
 };
 GOptionContext *context;
 GError *error = NULL;
 
+#ifdef ENABLE_NLS
 bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
 bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 textdomain (GETTEXT_PACKAGE);
+#endif /* ENABLE_NLS */
 
 g_set_application_name (_("Disk Usage Analyzer"));
 
diff --git a/baobab/src/baobab.h b/baobab/src/baobab.h
index ad6edbab..a84c9334 100644
--- a/baobab/src/baobab.h
+++ b/baobab/src/baobab.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
diff --git a/baobab/src/callbacks.c b/baobab/src/callbacks.c
index 3e6c13d2..7e8ad638 100644
--- a/baobab/src/callbacks.c
+++ b/baobab/src/callbacks.c
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
@@ -89,7 +90,6 @@ on_about_activate (GtkMenuItem *menuitem, gpointer user_data)
 "along with this program. If not, see <https://www.gnu.org/licenses/>.")
 };
 
-
 gchar* license_trans = g_strjoin("\n\n", _(license[0]), _(license[1]), _(license[2]), NULL);
 
 #ifdef ENABLE_NLS
diff --git a/baobab/src/callbacks.h b/baobab/src/callbacks.h
index 9296de8d..e120aa35 100644
--- a/baobab/src/callbacks.h
+++ b/baobab/src/callbacks.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2006 Fabio Marzocca <[email protected]>
+ * Copyright (C) 2012-2021 MATE Developers
 *
 * This file is part of MATE Utils.
 *
@@ -27,6 +28,8 @@ void on_about_activate (GtkMenuItem *menuitem, gpointer user_data);
 void on_menuscanhome_activate (GtkMenuItem *menuitem, gpointer user_data);
 void on_menuallfs_activate (GtkMenuItem *menuitem, gpointer user_data);
 void on_menuscandir_activate (GtkMenuItem *menuitem, gpointer user_data);
+void on_menu_collapse_activate (GtkMenuItem *menuitem, gpointer user_data);
+void on_menu_expand_activate (GtkMenuItem *menuitem, gpointer user_data);
 void on_menu_stop_activate (GtkMenuItem *menuitem, gpointer user_data);
 void on_menu_rescan_activate (GtkMenuItem *menuitem, gpointer user_data);
 void on_tbscandir_clicked (GtkToolButton *toolbutton, gpointer user_data);