[Xfce4-commits] <thunar:master> Remove unused functions or make them static.
Nick Schermer
noreply at xfce.org
Sun Sep 30 15:48:01 CEST 2012
Updating branch refs/heads/master
to e121ed80d9bfba8b133ca1943f76ad48bcab9b76 (commit)
from edc8e5da5777813956cd8b30a4f64f586c97a3ee (commit)
commit e121ed80d9bfba8b133ca1943f76ad48bcab9b76
Author: Nick Schermer <nick at xfce.org>
Date: Sun Sep 30 15:43:20 2012 +0200
Remove unused functions or make them static.
thunar/Makefile.am | 2 -
thunar/thunar-application.c | 3 +-
thunar/thunar-application.h | 2 -
thunar/thunar-chooser-button.c | 19 +----
thunar/thunar-chooser-button.h | 1 -
thunar/thunar-chooser-dialog.c | 110 +++++++++++-------------
thunar/thunar-chooser-dialog.h | 10 --
thunar/thunar-column-editor.c | 17 +----
thunar/thunar-column-editor.h | 2 -
thunar/thunar-create-dialog.c | 65 ++++----------
thunar/thunar-create-dialog.h | 20 +---
thunar/thunar-debug.c | 70 ---------------
thunar/thunar-debug.h | 50 -----------
thunar/thunar-details-view.c | 25 +----
thunar/thunar-details-view.h | 6 --
thunar/thunar-emblem-chooser.c | 43 +++++----
thunar/thunar-emblem-chooser.h | 4 -
thunar/thunar-enum-types.c | 49 +----------
thunar/thunar-enum-types.h | 42 ---------
thunar/thunar-file.c | 27 ++----
thunar/thunar-file.h | 10 --
thunar/thunar-folder.c | 22 +----
thunar/thunar-folder.h | 2 -
thunar/thunar-gio-extensions.c | 17 ----
thunar/thunar-gio-extensions.h | 1 -
thunar/thunar-history.c | 81 +++++++----------
thunar/thunar-history.h | 5 -
thunar/thunar-icon-factory.c | 17 ----
thunar/thunar-icon-factory.h | 2 -
thunar/thunar-launcher.c | 4 +-
thunar/thunar-launcher.h | 1 -
thunar/thunar-list-model.c | 38 +++-----
thunar/thunar-list-model.h | 11 ---
thunar/thunar-location-buttons.c | 18 ----
thunar/thunar-location-buttons.h | 2 -
thunar/thunar-marshal.list | 2 -
thunar/thunar-permissions-chooser.c | 32 ++++----
thunar/thunar-permissions-chooser.h | 4 -
thunar/thunar-progress-view.c | 22 +----
thunar/thunar-progress-view.h | 4 -
thunar/thunar-properties-dialog.c | 4 +-
thunar/thunar-properties-dialog.h | 1 -
thunar/thunar-renamer-dialog.c | 167 ++++++++++++++++------------------
thunar/thunar-renamer-dialog.h | 12 ---
thunar/thunar-renamer-model.c | 14 ++-
thunar/thunar-renamer-model.h | 8 --
thunar/thunar-renamer-pair.c | 6 +-
thunar/thunar-renamer-pair.h | 1 -
thunar/thunar-shortcuts-pane.c | 18 ----
thunar/thunar-shortcuts-pane.h | 2 -
thunar/thunar-size-label.c | 36 ++++----
thunar/thunar-size-label.h | 4 -
thunar/thunar-statusbar.c | 34 ++++----
thunar/thunar-statusbar.h | 3 -
thunar/thunar-tree-model.c | 7 +-
thunar/thunar-tree-model.h | 4 -
thunar/thunar-tree-pane.c | 15 ---
thunar/thunar-tree-pane.h | 2 -
thunar/thunar-tree-view.c | 37 ++++----
thunar/thunar-tree-view.h | 4 -
thunar/thunar-user.c | 64 ++++----------
thunar/thunar-user.h | 2 -
thunar/thunar-window.c | 81 +++++------------
thunar/thunar-window.h | 6 --
64 files changed, 387 insertions(+), 1007 deletions(-)
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 087c9cc..a487f64 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -64,8 +64,6 @@ thunar_SOURCES = \
thunar-component.h \
thunar-create-dialog.c \
thunar-create-dialog.h \
- thunar-debug.h \
- thunar-debug.c \
thunar-deep-count-job.h \
thunar-deep-count-job.c \
thunar-details-view-ui.h \
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 94762ac..c2d499b 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -118,6 +118,7 @@ static void thunar_application_volman_watch_destroy (gpointer
#endif
static gboolean thunar_application_show_dialogs (gpointer user_data);
static void thunar_application_show_dialogs_destroy (gpointer user_data);
+static GtkWidget *thunar_application_get_progress_dialog (ThunarApplication *application);
static void thunar_application_process_files (ThunarApplication *application);
@@ -1046,7 +1047,7 @@ thunar_application_bulk_rename (ThunarApplication *application,
-GtkWidget *
+static GtkWidget *
thunar_application_get_progress_dialog (ThunarApplication *application)
{
_thunar_return_val_if_fail (THUNAR_IS_APPLICATION (application), NULL);
diff --git a/thunar/thunar-application.h b/thunar/thunar-application.h
index f674544..3cd5628 100644
--- a/thunar/thunar-application.h
+++ b/thunar/thunar-application.h
@@ -66,8 +66,6 @@ gboolean thunar_application_bulk_rename (ThunarAppli
const gchar *startup_id,
GError **error);
-GtkWidget *thunar_application_get_progress_dialog (ThunarApplication *application);
-
gboolean thunar_application_process_filenames (ThunarApplication *application,
const gchar *working_directory,
gchar **filenames,
diff --git a/thunar/thunar-chooser-button.c b/thunar/thunar-chooser-button.c
index fa2cf8b..71fcafe 100644
--- a/thunar/thunar-chooser-button.c
+++ b/thunar/thunar-chooser-button.c
@@ -206,7 +206,7 @@ thunar_chooser_button_get_property (GObject *object,
switch (prop_id)
{
case PROP_FILE:
- g_value_set_object (value, thunar_chooser_button_get_file (chooser_button));
+ g_value_set_object (value, chooser_button->file);
break;
default:
@@ -535,23 +535,6 @@ thunar_chooser_button_new (void)
/**
- * thunar_chooser_button_get_file:
- * @chooser_button : a #ThunarChooserButton instance.
- *
- * Returns the #ThunarFile associated with @chooser_button.
- *
- * Return value: the file associated with @chooser_button.
- **/
-ThunarFile*
-thunar_chooser_button_get_file (ThunarChooserButton *chooser_button)
-{
- _thunar_return_val_if_fail (THUNAR_IS_CHOOSER_BUTTON (chooser_button), NULL);
- return chooser_button->file;
-}
-
-
-
-/**
* thunar_chooser_button_set_file:
* @chooser_button : a #ThunarChooserButton instance.
* @file : a #ThunarFile or %NULL.
diff --git a/thunar/thunar-chooser-button.h b/thunar/thunar-chooser-button.h
index 75e2634..5890aa0 100644
--- a/thunar/thunar-chooser-button.h
+++ b/thunar/thunar-chooser-button.h
@@ -38,7 +38,6 @@ GType thunar_chooser_button_get_type (void) G_GNUC_CONST;
GtkWidget *thunar_chooser_button_new (void) G_GNUC_MALLOC;
-ThunarFile *thunar_chooser_button_get_file (ThunarChooserButton *chooser_button);
void thunar_chooser_button_set_file (ThunarChooserButton *chooser_button,
ThunarFile *file);
diff --git a/thunar/thunar-chooser-dialog.c b/thunar/thunar-chooser-dialog.c
index a593565..7052d4f 100644
--- a/thunar/thunar-chooser-dialog.c
+++ b/thunar/thunar-chooser-dialog.c
@@ -51,47 +51,52 @@ enum
-static void thunar_chooser_dialog_dispose (GObject *object);
-static void thunar_chooser_dialog_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void thunar_chooser_dialog_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void thunar_chooser_dialog_realize (GtkWidget *widget);
-static void thunar_chooser_dialog_response (GtkDialog *widget,
- gint response);
-static gboolean thunar_chooser_dialog_selection_func (GtkTreeSelection *selection,
- GtkTreeModel *model,
- GtkTreePath *path,
- gboolean path_currently_selected,
- gpointer user_data);
-static gboolean thunar_chooser_dialog_context_menu (ThunarChooserDialog *dialog,
- guint button,
- guint32 time);
-static void thunar_chooser_dialog_update_accept (ThunarChooserDialog *dialog);
-static void thunar_chooser_dialog_update_header (ThunarChooserDialog *dialog);
-static void thunar_chooser_dialog_action_remove (ThunarChooserDialog *dialog);
-static void thunar_chooser_dialog_browse_clicked (GtkWidget *button,
- ThunarChooserDialog *dialog);
-static gboolean thunar_chooser_dialog_button_press_event (GtkWidget *tree_view,
- GdkEventButton *event,
- ThunarChooserDialog *dialog);
-static void thunar_chooser_dialog_notify_expanded (GtkExpander *expander,
- GParamSpec *pspec,
- ThunarChooserDialog *dialog);
-static void thunar_chooser_dialog_expand (ThunarChooserDialog *dialog);
-static gboolean thunar_chooser_dialog_popup_menu (GtkWidget *tree_view,
- ThunarChooserDialog *dialog);
-static void thunar_chooser_dialog_row_activated (GtkTreeView *treeview,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- ThunarChooserDialog *dialog);
-static void thunar_chooser_dialog_selection_changed (GtkTreeSelection *selection,
- ThunarChooserDialog *dialog);
-
+static void thunar_chooser_dialog_dispose (GObject *object);
+static void thunar_chooser_dialog_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void thunar_chooser_dialog_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void thunar_chooser_dialog_realize (GtkWidget *widget);
+static void thunar_chooser_dialog_response (GtkDialog *widget,
+ gint response);
+static gboolean thunar_chooser_dialog_selection_func (GtkTreeSelection *selection,
+ GtkTreeModel *model,
+ GtkTreePath *path,
+ gboolean path_currently_selected,
+ gpointer user_data);
+static gboolean thunar_chooser_dialog_context_menu (ThunarChooserDialog *dialog,
+ guint button,
+ guint32 time);
+static void thunar_chooser_dialog_update_accept (ThunarChooserDialog *dialog);
+static void thunar_chooser_dialog_update_header (ThunarChooserDialog *dialog);
+static void thunar_chooser_dialog_action_remove (ThunarChooserDialog *dialog);
+static void thunar_chooser_dialog_browse_clicked (GtkWidget *button,
+ ThunarChooserDialog *dialog);
+static gboolean thunar_chooser_dialog_button_press_event (GtkWidget *tree_view,
+ GdkEventButton *event,
+ ThunarChooserDialog *dialog);
+static void thunar_chooser_dialog_notify_expanded (GtkExpander *expander,
+ GParamSpec *pspec,
+ ThunarChooserDialog *dialog);
+static void thunar_chooser_dialog_expand (ThunarChooserDialog *dialog);
+static gboolean thunar_chooser_dialog_popup_menu (GtkWidget *tree_view,
+ ThunarChooserDialog *dialog);
+static void thunar_chooser_dialog_row_activated (GtkTreeView *treeview,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ ThunarChooserDialog *dialog);
+static void thunar_chooser_dialog_selection_changed (GtkTreeSelection *selection,
+ ThunarChooserDialog *dialog);
+static ThunarFile *thunar_chooser_dialog_get_file (ThunarChooserDialog *dialog);
+static void thunar_chooser_dialog_set_file (ThunarChooserDialog *dialog,
+ ThunarFile *file);
+static gboolean thunar_chooser_dialog_get_open (ThunarChooserDialog *dialog);
+static void thunar_chooser_dialog_set_open (ThunarChooserDialog *dialog,
+ gboolean open);
struct _ThunarChooserDialogClass
@@ -1043,21 +1048,6 @@ thunar_chooser_dialog_selection_changed (GtkTreeSelection *selection,
/**
- * thunar_chooser_dialog_new:
- *
- * Allocates a new #ThunarChooserDialog.
- *
- * Return value: the newly allocated #ThunarChooserDialog.
- **/
-GtkWidget*
-thunar_chooser_dialog_new (void)
-{
- return g_object_new (THUNAR_TYPE_CHOOSER_DIALOG, NULL);
-}
-
-
-
-/**
* thunar_chooser_dialog_get_file:
* @dialog : a #ThunarChooserDialog.
*
@@ -1066,7 +1056,7 @@ thunar_chooser_dialog_new (void)
*
* Return value: the #ThunarFile associated with @dialog.
**/
-ThunarFile*
+static ThunarFile*
thunar_chooser_dialog_get_file (ThunarChooserDialog *dialog)
{
_thunar_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), NULL);
@@ -1082,7 +1072,7 @@ thunar_chooser_dialog_get_file (ThunarChooserDialog *dialog)
*
* Associates @dialog with @file.
**/
-void
+static void
thunar_chooser_dialog_set_file (ThunarChooserDialog *dialog,
ThunarFile *file)
{
@@ -1143,7 +1133,7 @@ thunar_chooser_dialog_set_file (ThunarChooserDialog *dialog,
*
* Return value: %TRUE if @dialog should open the file.
**/
-gboolean
+static gboolean
thunar_chooser_dialog_get_open (ThunarChooserDialog *dialog)
{
_thunar_return_val_if_fail (THUNAR_IS_CHOOSER_DIALOG (dialog), FALSE);
@@ -1159,7 +1149,7 @@ thunar_chooser_dialog_get_open (ThunarChooserDialog *dialog)
*
* Sets whether the chooser @dialog should open the file.
**/
-void
+static void
thunar_chooser_dialog_set_open (ThunarChooserDialog *dialog,
gboolean open)
{
diff --git a/thunar/thunar-chooser-dialog.h b/thunar/thunar-chooser-dialog.h
index 0f0f42b..d563055 100644
--- a/thunar/thunar-chooser-dialog.h
+++ b/thunar/thunar-chooser-dialog.h
@@ -36,16 +36,6 @@ typedef struct _ThunarChooserDialog ThunarChooserDialog;
GType thunar_chooser_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget *thunar_chooser_dialog_new (void) G_GNUC_MALLOC;
-
-ThunarFile *thunar_chooser_dialog_get_file (ThunarChooserDialog *dialog);
-void thunar_chooser_dialog_set_file (ThunarChooserDialog *dialog,
- ThunarFile *file);
-
-gboolean thunar_chooser_dialog_get_open (ThunarChooserDialog *dialog);
-void thunar_chooser_dialog_set_open (ThunarChooserDialog *dialog,
- gboolean open);
-
void thunar_show_chooser_dialog (gpointer parent,
ThunarFile *file,
gboolean open);
diff --git a/thunar/thunar-column-editor.c b/thunar/thunar-column-editor.c
index 7458c6c..b321d52 100644
--- a/thunar/thunar-column-editor.c
+++ b/thunar/thunar-column-editor.c
@@ -513,21 +513,6 @@ thunar_column_editor_use_defaults (GtkWidget *button,
/**
- * thunar_column_editor_new:
- *
- * Allocates a new #ThunarColumnEditor instance.
- *
- * Return value: the newly allocated #ThunarColumnEditor.
- **/
-GtkWidget*
-thunar_column_editor_new (void)
-{
- return g_object_new (THUNAR_TYPE_COLUMN_EDITOR, NULL);
-}
-
-
-
-/**
* thunar_show_column_editor:
* @parent : the #GtkWidget the #GdkScreen on which to open the
* column editor dialog. May also be %NULL in which case
@@ -568,7 +553,7 @@ thunar_show_column_editor (gpointer parent)
}
/* display the column editor */
- dialog = thunar_column_editor_new ();
+ dialog = g_object_new (THUNAR_TYPE_COLUMN_EDITOR, NULL);
/* check if we have a toplevel window */
if (G_LIKELY (window != NULL && gtk_widget_get_toplevel (window)))
diff --git a/thunar/thunar-column-editor.h b/thunar/thunar-column-editor.h
index b630a13..8d2a64a 100644
--- a/thunar/thunar-column-editor.h
+++ b/thunar/thunar-column-editor.h
@@ -36,8 +36,6 @@ typedef struct _ThunarColumnEditor ThunarColumnEditor;
GType thunar_column_editor_get_type (void) G_GNUC_CONST;
-GtkWidget *thunar_column_editor_new (void) G_GNUC_MALLOC;
-
void thunar_show_column_editor (gpointer parent);
G_END_DECLS;
diff --git a/thunar/thunar-create-dialog.c b/thunar/thunar-create-dialog.c
index 64a7bc2..781b060 100644
--- a/thunar/thunar-create-dialog.c
+++ b/thunar/thunar-create-dialog.c
@@ -43,19 +43,24 @@ enum
-static void thunar_create_dialog_dispose (GObject *object);
-static void thunar_create_dialog_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void thunar_create_dialog_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void thunar_create_dialog_realize (GtkWidget *widget);
-static void thunar_create_dialog_update_image (ThunarCreateDialog *dialog);
-static void thunar_create_dialog_text_changed (GtkWidget *entry,
- ThunarCreateDialog *dialog);
+static void thunar_create_dialog_dispose (GObject *object);
+static void thunar_create_dialog_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void thunar_create_dialog_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void thunar_create_dialog_realize (GtkWidget *widget);
+static void thunar_create_dialog_update_image (ThunarCreateDialog *dialog);
+static void thunar_create_dialog_text_changed (GtkWidget *entry,
+ ThunarCreateDialog *dialog);
+static const gchar *thunar_create_dialog_get_filename (const ThunarCreateDialog *dialog);
+static void thunar_create_dialog_set_filename (ThunarCreateDialog *dialog,
+ const gchar *filename);
+static void thunar_create_dialog_set_content_type (ThunarCreateDialog *dialog,
+ const gchar *content_type);
@@ -189,7 +194,7 @@ thunar_create_dialog_get_property (GObject *object,
break;
case PROP_CONTENT_TYPE:
- g_value_set_string (value, thunar_create_dialog_get_content_type (dialog));
+ g_value_set_string (value, dialog->content_type);
break;
default:
@@ -286,21 +291,6 @@ thunar_create_dialog_text_changed (GtkWidget *entry,
/**
- * thunar_create_dialog_new:
- *
- * Allocates a new #ThunarCreateDialog instance.
- *
- * Return value: the newly allocated #ThunarCreateDialog instance.
- **/
-GtkWidget*
-thunar_create_dialog_new (void)
-{
- return g_object_new (THUNAR_TYPE_CREATE_DIALOG, NULL);
-}
-
-
-
-/**
* thunar_create_dialog_get_filename:
* @dialog : a #ThunarCreateDialog.
*
@@ -368,23 +358,6 @@ thunar_create_dialog_set_filename (ThunarCreateDialog *dialog,
/**
- * thunar_create_dialog_get_content_type:
- * @dialog : a #ThunarCreateDialog.
- *
- * Returns the current content type for @dialog or %NULL.
- *
- * Return value: the content type for @dialog.
- **/
-const gchar *
-thunar_create_dialog_get_content_type (const ThunarCreateDialog *dialog)
-{
- _thunar_return_val_if_fail (THUNAR_IS_CREATE_DIALOG (dialog), NULL);
- return dialog->content_type;
-}
-
-
-
-/**
* thunar_create_dialog_set_content_type:
* @dialog : a #ThunarCreateDialog.
* @content_type : the new content type.
diff --git a/thunar/thunar-create-dialog.h b/thunar/thunar-create-dialog.h
index 62b1a22..f92f4f2 100644
--- a/thunar/thunar-create-dialog.h
+++ b/thunar/thunar-create-dialog.h
@@ -35,22 +35,12 @@ typedef struct _ThunarCreateDialog ThunarCreateDialog;
#define THUNAR_IS_CREATE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), THUNAR_TYPE_CREATE_DIALOG))
#define THUNAR_CREATE_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), THUNAR_TYPE_CREATE_DIALOG, ThunarCreateDialogClass))
-GType thunar_create_dialog_get_type (void) G_GNUC_CONST;
+GType thunar_create_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget *thunar_create_dialog_new (void) G_GNUC_MALLOC;
-
-const gchar *thunar_create_dialog_get_filename (const ThunarCreateDialog *dialog);
-void thunar_create_dialog_set_filename (ThunarCreateDialog *dialog,
- const gchar *filename);
-
-const gchar *thunar_create_dialog_get_content_type (const ThunarCreateDialog *dialog);
-void thunar_create_dialog_set_content_type (ThunarCreateDialog *dialog,
- const gchar *content_type);
-
-gchar *thunar_show_create_dialog (gpointer parent,
- const gchar *content_type,
- const gchar *filename,
- const gchar *title) G_GNUC_MALLOC;
+gchar *thunar_show_create_dialog (gpointer parent,
+ const gchar *content_type,
+ const gchar *filename,
+ const gchar *title) G_GNUC_MALLOC;
G_END_DECLS;
diff --git a/thunar/thunar-debug.c b/thunar/thunar-debug.c
deleted file mode 100644
index 38d3087..0000000
--- a/thunar/thunar-debug.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifdef HAVE_STDARG_H
-#include <stdarg.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <thunar/thunar-debug.h>
-
-#include <glib/gstdio.h>
-
-
-
-/**
- * thunar_debug_mark:
- * @file : the filename.
- * @line : the line in @file.
- * @format : the message format.
- * @... : the @format parameters.
- *
- * Sets a profile mark.
- **/
-void
-thunar_debug_mark (const gchar *file,
- const gint line,
- const gchar *format,
- ...)
-{
-#ifdef G_ENABLE_DEBUG
- va_list args;
- gchar *formatted;
- gchar *message;
-
- va_start (args, format);
- formatted = g_strdup_vprintf (format, args);
- va_end (args);
-
- message = g_strdup_printf ("MARK: %s: %s:%d: %s", g_get_prgname(), file, line, formatted);
-
- g_access (message, F_OK);
-
- g_free (formatted);
- g_free (message);
-#endif
-}
-
-
diff --git a/thunar/thunar-debug.h b/thunar/thunar-debug.h
deleted file mode 100644
index 7b0c64c..0000000
--- a/thunar/thunar-debug.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* $Id$ */
-/*-
- * Copyright (c) 2006 Benedikt Meurer <benny at xfce.org>.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef __THUNAR_DEBUG_H__
-#define __THUNAR_DEBUG_H__
-
-#include <glib.h>
-
-G_BEGIN_DECLS;
-
-#if defined(G_ENABLE_DEBUG) && defined(G_HAVE_ISO_VARARGS)
-
-#define THUNAR_DEBUG_MARK(...) \
-G_STMT_START{ \
- thunar_debug_mark (__FILE__, __LINE__, __VA_ARGS__); \
-}G_STMT_END
-
-#else
-
-#define THUNAR_DEBUG_MARK(...) \
-G_STMT_START{ \
- (void)0; \
-}G_STMT_END
-
-#endif
-
-void thunar_debug_mark (const gchar *file,
- const gint line,
- const gchar *format,
- ...);
-
-G_END_DECLS;
-
-#endif /* !__THUNAR_DEBUG_H__ */
diff --git a/thunar/thunar-details-view.c b/thunar/thunar-details-view.c
index f0c3237..1c25884 100644
--- a/thunar/thunar-details-view.c
+++ b/thunar/thunar-details-view.c
@@ -98,6 +98,9 @@ static void thunar_details_view_columns_changed (ThunarColumnMod
static void thunar_details_view_zoom_level_changed (ThunarDetailsView *details_view);
static void thunar_details_view_action_setup_columns (GtkAction *action,
ThunarDetailsView *details_view);
+static gboolean thunar_details_view_get_fixed_columns (ThunarDetailsView *details_view);
+static void thunar_details_view_set_fixed_columns (ThunarDetailsView *details_view,
+ gboolean fixed_columns);
@@ -839,22 +842,6 @@ thunar_details_view_action_setup_columns (GtkAction *action,
/**
- * thunar_details_view_new:
- *
- * Allocates a new #ThunarDetailsView instance, which is not
- * associated with any #ThunarListModel yet.
- *
- * Return value: the newly allocated #ThunarDetailsView instance.
- **/
-GtkWidget*
-thunar_details_view_new (void)
-{
- return g_object_new (THUNAR_TYPE_DETAILS_VIEW, NULL);
-}
-
-
-
-/**
* thunar_details_view_get_fixed_columns:
* @details_view : a #ThunarDetailsView.
*
@@ -862,7 +849,7 @@ thunar_details_view_new (void)
*
* Return value: %TRUE if @details_view uses fixed column widths.
**/
-gboolean
+static gboolean
thunar_details_view_get_fixed_columns (ThunarDetailsView *details_view)
{
_thunar_return_val_if_fail (THUNAR_IS_DETAILS_VIEW (details_view), FALSE);
@@ -878,7 +865,7 @@ thunar_details_view_get_fixed_columns (ThunarDetailsView *details_view)
*
* Applies @fixed_columns to @details_view.
**/
-void
+static void
thunar_details_view_set_fixed_columns (ThunarDetailsView *details_view,
gboolean fixed_columns)
{
@@ -927,5 +914,3 @@ thunar_details_view_set_fixed_columns (ThunarDetailsView *details_view,
g_object_notify (G_OBJECT (details_view), "fixed-columns");
}
}
-
-
diff --git a/thunar/thunar-details-view.h b/thunar/thunar-details-view.h
index 7c346a5..323cf97 100644
--- a/thunar/thunar-details-view.h
+++ b/thunar/thunar-details-view.h
@@ -36,12 +36,6 @@ typedef struct _ThunarDetailsView ThunarDetailsView;
GType thunar_details_view_get_type (void) G_GNUC_CONST;
-GtkWidget *thunar_details_view_new (void);
-
-gboolean thunar_details_view_get_fixed_columns (ThunarDetailsView *details_view);
-void thunar_details_view_set_fixed_columns (ThunarDetailsView *details_view,
- gboolean fixed_columns);
-
G_END_DECLS;
#endif /* !__THUNAR_DETAILS_VIEW_H__ */
diff --git a/thunar/thunar-emblem-chooser.c b/thunar/thunar-emblem-chooser.c
index d58a11a..660cce2 100644
--- a/thunar/thunar-emblem-chooser.c
+++ b/thunar/thunar-emblem-chooser.c
@@ -43,26 +43,29 @@ enum
-static void thunar_emblem_chooser_dispose (GObject *object);
-static void thunar_emblem_chooser_finalize (GObject *object);
-static void thunar_emblem_chooser_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void thunar_emblem_chooser_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void thunar_emblem_chooser_realize (GtkWidget *widget);
-static void thunar_emblem_chooser_unrealize (GtkWidget *widget);
-static void thunar_emblem_chooser_button_toggled (GtkToggleButton *button,
- ThunarEmblemChooser *chooser);
-static void thunar_emblem_chooser_file_changed (ThunarEmblemChooser *chooser);
-static void thunar_emblem_chooser_theme_changed (GtkIconTheme *icon_theme,
- ThunarEmblemChooser *chooser);
-static void thunar_emblem_chooser_create_buttons (ThunarEmblemChooser *chooser);
-static GtkWidget *thunar_emblem_chooser_create_button (ThunarEmblemChooser *chooser,
- const gchar *emblem);
+static void thunar_emblem_chooser_dispose (GObject *object);
+static void thunar_emblem_chooser_finalize (GObject *object);
+static void thunar_emblem_chooser_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void thunar_emblem_chooser_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void thunar_emblem_chooser_realize (GtkWidget *widget);
+static void thunar_emblem_chooser_unrealize (GtkWidget *widget);
+static void thunar_emblem_chooser_button_toggled (GtkToggleButton *button,
+ ThunarEmblemChooser *chooser);
+static void thunar_emblem_chooser_file_changed (ThunarEmblemChooser *chooser);
+static void thunar_emblem_chooser_theme_changed (GtkIconTheme *icon_theme,
+ ThunarEmblemChooser *chooser);
+static void thunar_emblem_chooser_create_buttons (ThunarEmblemChooser *chooser);
+static GtkWidget *thunar_emblem_chooser_create_button (ThunarEmblemChooser *chooser,
+ const gchar *emblem);
+static GList *thunar_emblem_chooser_get_files (const ThunarEmblemChooser *chooser);
+static void thunar_emblem_chooser_set_files (ThunarEmblemChooser *chooser,
+ GList *files);
diff --git a/thunar/thunar-emblem-chooser.h b/thunar/thunar-emblem-chooser.h
index f9eced2..d97a658 100644
--- a/thunar/thunar-emblem-chooser.h
+++ b/thunar/thunar-emblem-chooser.h
@@ -38,10 +38,6 @@ GType thunar_emblem_chooser_get_type (void) G_GNUC_CONST;
GtkWidget *thunar_emblem_chooser_new (void) G_GNUC_MALLOC;
-GList *thunar_emblem_chooser_get_files (const ThunarEmblemChooser *chooser);
-void thunar_emblem_chooser_set_files (ThunarEmblemChooser *chooser,
- GList *files);
-
G_END_DECLS;
#endif /* !__THUNAR_EMBLEM_CHOOSER_H__ */
diff --git a/thunar/thunar-enum-types.c b/thunar/thunar-enum-types.c
index b9303b6..d671338 100644
--- a/thunar/thunar-enum-types.c
+++ b/thunar/thunar-enum-types.c
@@ -57,29 +57,6 @@ thunar_renamer_mode_get_type (void)
GType
-thunar_color_style_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- static const GEnumValue values[] =
- {
- { THUNAR_COLOR_STYLE_SOLID, "THUNAR_COLOR_STYLE_SOLID", "solid", },
- { THUNAR_COLOR_STYLE_HGRADIENT, "THUNAR_COLOR_STYLE_HGRADIENT", "hgradient", },
- { THUNAR_COLOR_STYLE_VGRADIENT, "THUNAR_COLOR_STYLE_VGRADIENT", "vgradient", },
- { 0, NULL, NULL, },
- };
-
- type = g_enum_register_static (I_("ThunarColorStyle"), values);
- }
-
- return type;
-}
-
-
-
-GType
thunar_date_style_get_type (void)
{
static GType type = G_TYPE_INVALID;
@@ -185,30 +162,6 @@ thunar_recursive_permissions_get_type (void)
GType
-thunar_wallpaper_style_get_type (void)
-{
- static GType type = G_TYPE_INVALID;
-
- if (G_UNLIKELY (type == G_TYPE_INVALID))
- {
- static const GEnumValue values[] =
- {
- { THUNAR_WALLPAPER_STYLE_CENTERED, "THUNAR_WALLPAPER_STYLE_CENTERED", "centered", },
- { THUNAR_WALLPAPER_STYLE_SCALED, "THUNAR_WALLPAPER_STYLE_SCALED", "scaled", },
- { THUNAR_WALLPAPER_STYLE_STRETCHED, "THUNAR_WALLPAPER_STYLE_STRETCHED", "stretched", },
- { THUNAR_WALLPAPER_STYLE_TILED, "THUNAR_WALLPAPER_STYLE_TILED", "tiled", },
- { 0, NULL, NULL, },
- };
-
- type = g_enum_register_static (I_("ThunarWallpaperStyle"), values);
- }
-
- return type;
-}
-
-
-
-GType
thunar_zoom_level_get_type (void)
{
static GType type = G_TYPE_INVALID;
@@ -246,7 +199,7 @@ thunar_zoom_level_get_type (void)
*
* Return value: the #ThunarIconSize for @zoom_level.
**/
-ThunarIconSize
+static ThunarIconSize
thunar_zoom_level_to_icon_size (ThunarZoomLevel zoom_level)
{
switch (zoom_level)
diff --git a/thunar/thunar-enum-types.h b/thunar/thunar-enum-types.h
index 8b4db52..7df8ee8 100644
--- a/thunar/thunar-enum-types.h
+++ b/thunar/thunar-enum-types.h
@@ -45,25 +45,6 @@ typedef enum
GType thunar_renamer_mode_get_type (void) G_GNUC_CONST;
-#define THUNAR_TYPE_COLOR_STYLE (thunar_color_style_get_type ())
-
-/**
- * ThunarColorStyle:
- * @THUNAR_COLOR_STYLE_SOLID : solid desktop background color.
- * @THUNAR_COLOR_STYLE_HGRADIENT : horizontal gradient from color0 to color1.
- * @THUNAR_COLOR_STYLE_VGRADIENT : vertical gradient from color0 to color1.
- *
- * Desktop background color style.
- **/
-typedef enum
-{
- THUNAR_COLOR_STYLE_SOLID,
- THUNAR_COLOR_STYLE_HGRADIENT,
- THUNAR_COLOR_STYLE_VGRADIENT,
-} ThunarColorStyle;
-
-GType thunar_color_style_get_type (void) G_GNUC_CONST;
-
#define THUNAR_TYPE_DATE_STYLE (thunar_date_style_get_type ())
@@ -181,28 +162,6 @@ typedef enum
GType thunar_recursive_permissions_get_type (void) G_GNUC_CONST;
-#define THUNAR_TYPE_WALLPAPER_STYLE (thunar_wallpaper_style_get_type ())
-
-/**
- * ThunarWallpaperStyle:
- * @THUNAR_WALLPAPER_STYLE_CENTERED : center the wallpaper.
- * @THUNAR_WALLPAPER_STYLE_SCALED : scale the wallpaper.
- * @THUNAR_WALLPAPER_STYLE_STRETCHED : stretch the wallpaper.
- * @THUNAR_WALLPAPER_STYLE_TILED : tile the wallpaper.
- *
- * Desktop background wallpaper style.
- **/
-typedef enum
-{
- THUNAR_WALLPAPER_STYLE_CENTERED,
- THUNAR_WALLPAPER_STYLE_SCALED,
- THUNAR_WALLPAPER_STYLE_STRETCHED,
- THUNAR_WALLPAPER_STYLE_TILED,
-} ThunarWallpaperStyle;
-
-GType thunar_wallpaper_style_get_type (void) G_GNUC_CONST;
-
-
#define THUNAR_TYPE_ZOOM_LEVEL (thunar_zoom_level_get_type ())
/**
@@ -233,7 +192,6 @@ typedef enum
} ThunarZoomLevel;
GType thunar_zoom_level_get_type (void) G_GNUC_CONST;
-ThunarIconSize thunar_zoom_level_to_icon_size (ThunarZoomLevel zoom_level) G_GNUC_CONST;
#define THUNAR_TYPE_JOB_RESPONSE (thunar_job_response_get_type ())
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 8fff580..9f7cae2 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -114,6 +114,12 @@ static void thunar_file_monitor (GFileMonitor
GFile *other_path,
GFileMonitorEvent event_type,
gpointer user_data);
+static gboolean thunar_file_load (ThunarFile *file,
+ GCancellable *cancellable,
+ GError **error);
+static gboolean thunar_file_is_readable (const ThunarFile *file);
+static gboolean thunar_file_same_filesystem (const ThunarFile *file_a,
+ const ThunarFile *file_b);
@@ -693,7 +699,7 @@ thunar_file_get_for_uri (const gchar *uri,
*
* Return value: %TRUE on success, %FALSE on error or interruption.
**/
-gboolean
+static gboolean
thunar_file_load (ThunarFile *file,
GCancellable *cancellable,
GError **error)
@@ -768,9 +774,6 @@ thunar_file_load (ThunarFile *file,
file->basename = g_file_get_basename (file->gfile);
_thunar_assert (file->basename != NULL);
- /* assume all files are not thumbnails themselves */
- file->is_thumbnail = FALSE;
-
/* create a GFile for the $HOME/.thumbnails/ directory */
thumbnail_dir_path = g_build_filename (xfce_get_homedir (), ".thumbnails", NULL);
thumbnail_dir = g_file_new_for_path (thumbnail_dir_path);
@@ -778,9 +781,6 @@ thunar_file_load (ThunarFile *file,
/* check if this file is a thumbnail */
if (g_file_has_prefix (file->gfile, thumbnail_dir))
{
- /* remember that this file is a thumbnail */
- file->is_thumbnail = TRUE;
-
/* use the filename as custom icon name for thumbnails */
file->custom_icon_name = g_file_get_path (file->gfile);
}
@@ -2250,7 +2250,7 @@ thunar_file_is_executable (const ThunarFile *file)
*
* Return value: %TRUE if @file can be read.
**/
-gboolean
+static gboolean
thunar_file_is_readable (const ThunarFile *file)
{
_thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
@@ -2805,15 +2805,6 @@ thunar_file_get_thumbnail_path (ThunarFile *file)
-gboolean
-thunar_file_is_thumbnail (const ThunarFile *file)
-{
- _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE);
- return file->is_thumbnail;
-}
-
-
-
/**
* thunar_file_set_thumb_state:
* @file : a #ThunarFile.
@@ -3398,7 +3389,7 @@ thunar_file_compare_by_name (const ThunarFile *file_a,
-gboolean
+static gboolean
thunar_file_same_filesystem (const ThunarFile *file_a,
const ThunarFile *file_b)
{
diff --git a/thunar/thunar-file.h b/thunar/thunar-file.h
index 289e518..9f6e23d 100644
--- a/thunar/thunar-file.h
+++ b/thunar/thunar-file.h
@@ -119,7 +119,6 @@ struct _ThunarFile
gchar *basename;
gchar *thumbnail_path;
guint flags;
- guint is_thumbnail : 1;
guint is_mounted : 1;
};
@@ -130,10 +129,6 @@ ThunarFile *thunar_file_get (GFile *file
ThunarFile *thunar_file_get_for_uri (const gchar *uri,
GError **error);
-gboolean thunar_file_load (ThunarFile *file,
- GCancellable *cancellable,
- GError **error);
-
ThunarFile *thunar_file_get_parent (const ThunarFile *file,
GError **error);
@@ -195,7 +190,6 @@ gboolean thunar_file_is_parent (const ThunarFile *file
gboolean thunar_file_is_ancestor (const ThunarFile *file,
const ThunarFile *ancestor);
gboolean thunar_file_is_executable (const ThunarFile *file);
-gboolean thunar_file_is_readable (const ThunarFile *file);
gboolean thunar_file_is_writable (const ThunarFile *file);
gboolean thunar_file_is_hidden (const ThunarFile *file);
gboolean thunar_file_is_home (const ThunarFile *file);
@@ -223,7 +217,6 @@ gboolean thunar_file_set_custom_icon (ThunarFile *fil
GError **error);
const gchar *thunar_file_get_thumbnail_path (ThunarFile *file);
-gboolean thunar_file_is_thumbnail (const ThunarFile *file);
void thunar_file_set_thumb_state (ThunarFile *file,
ThunarFileThumbState state);
GIcon *thunar_file_get_preview_icon (const ThunarFile *file);
@@ -243,9 +236,6 @@ gint thunar_file_compare_by_name (const ThunarFile *file
const ThunarFile *file_b,
gboolean case_sensitive);
-gboolean thunar_file_same_filesystem (const ThunarFile *file_a,
- const ThunarFile *file_b);
-
ThunarFile *thunar_file_cache_lookup (const GFile *file);
gchar *thunar_file_cached_display_name (const GFile *file);
diff --git a/thunar/thunar-folder.c b/thunar/thunar-folder.c
index e9da360..8dc051c 100644
--- a/thunar/thunar-folder.c
+++ b/thunar/thunar-folder.c
@@ -539,7 +539,8 @@ thunar_folder_file_destroyed (ThunarFileMonitor *file_monitor,
if (G_UNLIKELY (folder->corresponding_file == file))
{
/* the folder is useless now */
- thunar_folder_destroy (folder);
+ if (!folder->in_destruction)
+ g_object_run_dispose (G_OBJECT (folder));
}
else
{
@@ -834,22 +835,3 @@ thunar_folder_reload (ThunarFolder *folder)
/* tell all consumers that we're loading */
g_object_notify (G_OBJECT (folder), "loading");
}
-
-
-
-/**
- * thunar_folder_destroy:
- * @folder : a #ThunarFolder instance.
- *
- * Destroy the @folder, this is a replacement for
- * the old gtk_object_destroy function which has been
- * removed from gtk3.
- **/
-void
-thunar_folder_destroy (ThunarFolder *folder)
-{
- _thunar_return_if_fail (THUNAR_IS_FOLDER (folder));
-
- if (!folder->in_destruction)
- g_object_run_dispose (G_OBJECT (folder));
-}
diff --git a/thunar/thunar-folder.h b/thunar/thunar-folder.h
index 2d9c465..a111b62 100644
--- a/thunar/thunar-folder.h
+++ b/thunar/thunar-folder.h
@@ -44,8 +44,6 @@ gboolean thunar_folder_get_loading (const ThunarFolder *folder);
void thunar_folder_reload (ThunarFolder *folder);
-void thunar_folder_destroy (ThunarFolder *folder);
-
G_END_DECLS;
#endif /* !__THUNAR_FOLDER_H__ */
diff --git a/thunar/thunar-gio-extensions.c b/thunar/thunar-gio-extensions.c
index feeb328..626490b 100644
--- a/thunar/thunar-gio-extensions.c
+++ b/thunar/thunar-gio-extensions.c
@@ -129,23 +129,6 @@ thunar_g_file_is_home (GFile *file)
-gboolean
-thunar_g_file_is_desktop (GFile *file)
-{
- GFile *desktop;
- gboolean is_desktop;
-
- _thunar_return_val_if_fail (G_IS_FILE (file), FALSE);
-
- desktop = thunar_g_file_new_for_desktop ();
- is_desktop = g_file_equal (desktop, file);
- g_object_unref (desktop);
-
- return is_desktop;
-}
-
-
-
GKeyFile *
thunar_g_file_query_key_file (GFile *file,
GCancellable *cancellable,
diff --git a/thunar/thunar-gio-extensions.h b/thunar/thunar-gio-extensions.h
index 18b6f7e..93ca514 100644
--- a/thunar/thunar-gio-extensions.h
+++ b/thunar/thunar-gio-extensions.h
@@ -34,7 +34,6 @@ GFile *thunar_g_file_new_for_user_special_dir (GUserDirectory dir);
gboolean thunar_g_file_is_root (GFile *file);
gboolean thunar_g_file_is_trashed (GFile *file);
gboolean thunar_g_file_is_home (GFile *file);
-gboolean thunar_g_file_is_desktop (GFile *file);
GKeyFile *thunar_g_file_query_key_file (GFile *file,
GCancellable *cancellable,
diff --git a/thunar/thunar-history.c b/thunar/thunar-history.c
index d180a97..ce16db5 100644
--- a/thunar/thunar-history.c
+++ b/thunar/thunar-history.c
@@ -40,36 +40,38 @@ enum
-static void thunar_history_navigator_init (ThunarNavigatorIface *iface);
-static void thunar_history_dispose (GObject *object);
-static void thunar_history_finalize (GObject *object);
-static void thunar_history_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void thunar_history_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static ThunarFile *thunar_history_get_current_directory (ThunarNavigator *navigator);
-static void thunar_history_set_current_directory (ThunarNavigator *navigator,
- ThunarFile *current_directory);
-static void thunar_history_go_back (ThunarHistory *history,
- guint n);
-static void thunar_history_go_forward (ThunarHistory *history,
- guint n);
-static void thunar_history_action_back (GtkAction *action,
- ThunarHistory *history);
-static void thunar_history_action_back_nth (GtkWidget *item,
- ThunarHistory *history);
-static void thunar_history_action_forward (GtkAction *action,
- ThunarHistory *history);
-static void thunar_history_action_forward_nth (GtkWidget *item,
- ThunarHistory *history);
-static void thunar_history_show_menu (GtkAction *action,
- GtkWidget *menu,
- ThunarHistory *history);
-
+static void thunar_history_navigator_init (ThunarNavigatorIface *iface);
+static void thunar_history_dispose (GObject *object);
+static void thunar_history_finalize (GObject *object);
+static void thunar_history_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void thunar_history_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static ThunarFile *thunar_history_get_current_directory (ThunarNavigator *navigator);
+static void thunar_history_set_current_directory (ThunarNavigator *navigator,
+ ThunarFile *current_directory);
+static void thunar_history_go_back (ThunarHistory *history,
+ guint n);
+static void thunar_history_go_forward (ThunarHistory *history,
+ guint n);
+static void thunar_history_action_back (GtkAction *action,
+ ThunarHistory *history);
+static void thunar_history_action_back_nth (GtkWidget *item,
+ ThunarHistory *history);
+static void thunar_history_action_forward (GtkAction *action,
+ ThunarHistory *history);
+static void thunar_history_action_forward_nth (GtkWidget *item,
+ ThunarHistory *history);
+static void thunar_history_show_menu (GtkAction *action,
+ GtkWidget *menu,
+ ThunarHistory *history);
+static GtkActionGroup *thunar_history_get_action_group (const ThunarHistory *history);
+static void thunar_history_set_action_group (ThunarHistory *history,
+ GtkActionGroup *action_group);
struct _ThunarHistoryClass
@@ -486,21 +488,6 @@ thunar_history_show_menu (GtkAction *action,
/**
- * thunar_history_new:
- *
- * Allocates a new #ThunarHistory object.
- *
- * Return value: the newly allocated #ThunarHistory object.
- **/
-ThunarHistory*
-thunar_history_new (void)
-{
- return g_object_new (THUNAR_TYPE_HISTORY, NULL);
-}
-
-
-
-/**
* thunar_history_get_action_group:
* @history : a #ThunarHistory.
*
@@ -511,7 +498,7 @@ thunar_history_new (void)
* Return value: the #GtkActionGroup to which
* @history is currently attached.
**/
-GtkActionGroup*
+static GtkActionGroup*
thunar_history_get_action_group (const ThunarHistory *history)
{
_thunar_return_val_if_fail (THUNAR_IS_HISTORY (history), NULL);
@@ -530,7 +517,7 @@ thunar_history_get_action_group (const ThunarHistory *history)
* "forward" provided by @history on the given
* @action_group.
**/
-void
+static void
thunar_history_set_action_group (ThunarHistory *history,
GtkActionGroup *action_group)
{
diff --git a/thunar/thunar-history.h b/thunar/thunar-history.h
index 0b2a130..705d87f 100644
--- a/thunar/thunar-history.h
+++ b/thunar/thunar-history.h
@@ -36,11 +36,6 @@ typedef struct _ThunarHistory ThunarHistory;
GType thunar_history_get_type (void) G_GNUC_CONST;
-ThunarHistory *thunar_history_new (void) G_GNUC_MALLOC;
-
-GtkActionGroup *thunar_history_get_action_group (const ThunarHistory *history);
-void thunar_history_set_action_group (ThunarHistory *history,
- GtkActionGroup *action_group);
ThunarFile *thunar_history_peek_back (ThunarHistory *history);
ThunarFile *thunar_history_peek_forward (ThunarHistory *history);
diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
index de15f92..b42a43b 100644
--- a/thunar/thunar-icon-factory.c
+++ b/thunar/thunar-icon-factory.c
@@ -712,23 +712,6 @@ thunar_icon_factory_get_for_icon_theme (GtkIconTheme *icon_theme)
/**
- * thunar_icon_factory_get_icon_theme:
- * @factory : a #ThunarIconFactory instance.
- *
- * Returns the #GtkIconTheme associated with @factory.
- *
- * Return value: the #GtkIconTheme associated with @factory.
- **/
-GtkIconTheme*
-thunar_icon_factory_get_icon_theme (const ThunarIconFactory *factory)
-{
- _thunar_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
- return factory->icon_theme;
-}
-
-
-
-/**
* thunar_icon_factory_load_icon:
* @factory : a #ThunarIconFactory instance.
* @name : name of the icon to load.
diff --git a/thunar/thunar-icon-factory.h b/thunar/thunar-icon-factory.h
index 39d91ed..61d0de7 100644
--- a/thunar/thunar-icon-factory.h
+++ b/thunar/thunar-icon-factory.h
@@ -63,8 +63,6 @@ GType thunar_icon_factory_get_type (void) G_GNUC_CONS
ThunarIconFactory *thunar_icon_factory_get_default (void);
ThunarIconFactory *thunar_icon_factory_get_for_icon_theme (GtkIconTheme *icon_theme);
-GtkIconTheme *thunar_icon_factory_get_icon_theme (const ThunarIconFactory *factory);
-
GdkPixbuf *thunar_icon_factory_load_icon (ThunarIconFactory *factory,
const gchar *name,
gint size,
diff --git a/thunar/thunar-launcher.c b/thunar/thunar-launcher.c
index fcf6b82..a821681 100644
--- a/thunar/thunar-launcher.c
+++ b/thunar/thunar-launcher.c
@@ -116,7 +116,7 @@ static void thunar_launcher_poke_files_finish (Thuna
gpointer user_data);
static ThunarLauncherPokeData *thunar_launcher_poke_data_new (GList *files);
static void thunar_launcher_poke_data_free (ThunarLauncherPokeData *data);
-
+static GtkWidget *thunar_launcher_get_widget (const ThunarLauncher *launcher);
struct _ThunarLauncherClass
@@ -1639,7 +1639,7 @@ thunar_launcher_new (void)
*
* Return value: the widget associated with @launcher.
**/
-GtkWidget*
+static GtkWidget*
thunar_launcher_get_widget (const ThunarLauncher *launcher)
{
_thunar_return_val_if_fail (THUNAR_IS_LAUNCHER (launcher), NULL);
diff --git a/thunar/thunar-launcher.h b/thunar/thunar-launcher.h
index b7b888b..417894d 100644
--- a/thunar/thunar-launcher.h
+++ b/thunar/thunar-launcher.h
@@ -38,7 +38,6 @@ GType thunar_launcher_get_type (void) G_GNUC_CONST;
ThunarLauncher *thunar_launcher_new (void) G_GNUC_MALLOC;
-GtkWidget *thunar_launcher_get_widget (const ThunarLauncher *launcher);
void thunar_launcher_set_widget (ThunarLauncher *launcher,
GtkWidget *widget);
diff --git a/thunar/thunar-list-model.c b/thunar/thunar-list-model.c
index 53f0a12..db22f82 100644
--- a/thunar/thunar-list-model.c
+++ b/thunar/thunar-list-model.c
@@ -189,6 +189,14 @@ static gint sort_by_type (const ThunarF
const ThunarFile *b,
gboolean case_sensitive);
+static gboolean thunar_list_model_get_case_sensitive (ThunarListModel *store);
+static void thunar_list_model_set_case_sensitive (ThunarListModel *store,
+ gboolean case_sensitive);
+static ThunarDateStyle thunar_list_model_get_date_style (ThunarListModel *store);
+static void thunar_list_model_set_date_style (ThunarListModel *store,
+ ThunarDateStyle date_style);
+static gint thunar_list_model_get_num_files (ThunarListModel *store);
+static gboolean thunar_list_model_get_folders_first (ThunarListModel *store);
struct _ThunarListModelClass
@@ -1685,24 +1693,6 @@ thunar_list_model_new (void)
/**
- * thunar_list_model_new_with_folder:
- * @folder : a valid #ThunarFolder object.
- *
- * Allocates a new #ThunarListModel instance and associates
- * it with @folder.
- *
- * Return value: the newly created #ThunarListModel instance.
- **/
-ThunarListModel*
-thunar_list_model_new_with_folder (ThunarFolder *folder)
-{
- _thunar_return_val_if_fail (THUNAR_IS_FOLDER (folder), NULL);
- return g_object_new (THUNAR_TYPE_LIST_MODEL, "folder", folder, NULL);
-}
-
-
-
-/**
* thunar_list_model_get_case_sensitive:
* @store : a valid #ThunarListModel object.
*
@@ -1711,7 +1701,7 @@ thunar_list_model_new_with_folder (ThunarFolder *folder)
*
* Return value: %TRUE if sorting is case-sensitive.
**/
-gboolean
+static gboolean
thunar_list_model_get_case_sensitive (ThunarListModel *store)
{
_thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
@@ -1728,7 +1718,7 @@ thunar_list_model_get_case_sensitive (ThunarListModel *store)
* If @case_sensitive is %TRUE the sorting in @store will be done
* in a case-sensitive manner.
**/
-void
+static void
thunar_list_model_set_case_sensitive (ThunarListModel *store,
gboolean case_sensitive)
{
@@ -1760,7 +1750,7 @@ thunar_list_model_set_case_sensitive (ThunarListModel *store,
* Return value: the #ThunarDateStyle used to format dates in
* the given @store.
**/
-ThunarDateStyle
+static ThunarDateStyle
thunar_list_model_get_date_style (ThunarListModel *store)
{
_thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), THUNAR_DATE_STYLE_SIMPLE);
@@ -1778,7 +1768,7 @@ thunar_list_model_get_date_style (ThunarListModel *store)
* Chances the style used to format dates in @store to the specified
* @date_style.
**/
-void
+static void
thunar_list_model_set_date_style (ThunarListModel *store,
ThunarDateStyle date_style)
{
@@ -1971,7 +1961,7 @@ thunar_list_model_set_folder (ThunarListModel *store,
*
* Return value: %TRUE if @store lists folders first.
**/
-gboolean
+static gboolean
thunar_list_model_get_folders_first (ThunarListModel *store)
{
_thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), FALSE);
@@ -2147,7 +2137,7 @@ thunar_list_model_get_file (ThunarListModel *store,
*
* Return value: ahe number of visible files in @store.
**/
-gint
+static gint
thunar_list_model_get_num_files (ThunarListModel *store)
{
_thunar_return_val_if_fail (THUNAR_IS_LIST_MODEL (store), 0);
diff --git a/thunar/thunar-list-model.h b/thunar/thunar-list-model.h
index 0b157c8..9392a02 100644
--- a/thunar/thunar-list-model.h
+++ b/thunar/thunar-list-model.h
@@ -37,21 +37,11 @@ typedef struct _ThunarListModel ThunarListModel;
GType thunar_list_model_get_type (void) G_GNUC_CONST;
ThunarListModel *thunar_list_model_new (void);
-ThunarListModel *thunar_list_model_new_with_folder (ThunarFolder *folder);
-
-gboolean thunar_list_model_get_case_sensitive (ThunarListModel *store);
-void thunar_list_model_set_case_sensitive (ThunarListModel *store,
- gboolean case_sensitive);
-
-ThunarDateStyle thunar_list_model_get_date_style (ThunarListModel *store);
-void thunar_list_model_set_date_style (ThunarListModel *store,
- ThunarDateStyle date_style);
ThunarFolder *thunar_list_model_get_folder (ThunarListModel *store);
void thunar_list_model_set_folder (ThunarListModel *store,
ThunarFolder *folder);
-gboolean thunar_list_model_get_folders_first (ThunarListModel *store);
void thunar_list_model_set_folders_first (ThunarListModel *store,
gboolean folders_first);
@@ -62,7 +52,6 @@ void thunar_list_model_set_show_hidden (ThunarListModel *sto
ThunarFile *thunar_list_model_get_file (ThunarListModel *store,
GtkTreeIter *iter);
-gint thunar_list_model_get_num_files (ThunarListModel *store);
GList *thunar_list_model_get_paths_for_files (ThunarListModel *store,
GList *files);
diff --git a/thunar/thunar-location-buttons.c b/thunar/thunar-location-buttons.c
index 77c93dc..ae752a7 100644
--- a/thunar/thunar-location-buttons.c
+++ b/thunar/thunar-location-buttons.c
@@ -1441,21 +1441,3 @@ thunar_location_buttons_action_properties (GtkAction *action,
}
}
-
-
-/**
- * thunar_location_buttons_new:
- *
- * Creates a new #ThunarLocationButtons object, that does
- * not display any path by default.
- *
- * Return value: the newly allocated #ThunarLocationButtons object.
- **/
-GtkWidget*
-thunar_location_buttons_new (void)
-{
- return g_object_new (THUNAR_TYPE_LOCATION_BUTTONS, NULL);
-}
-
-
-
diff --git a/thunar/thunar-location-buttons.h b/thunar/thunar-location-buttons.h
index 2e536a2..b0b581c 100644
--- a/thunar/thunar-location-buttons.h
+++ b/thunar/thunar-location-buttons.h
@@ -36,8 +36,6 @@ typedef struct _ThunarLocationButtons ThunarLocationButtons;
GType thunar_location_buttons_get_type (void) G_GNUC_CONST;
-GtkWidget *thunar_location_buttons_new (void);
-
G_END_DECLS;
#endif /* !__THUNAR_LOCATION_BUTTONS_H__ */
diff --git a/thunar/thunar-marshal.list b/thunar/thunar-marshal.list
index c9d116c..59a4e91 100644
--- a/thunar/thunar-marshal.list
+++ b/thunar/thunar-marshal.list
@@ -2,8 +2,6 @@ BOOLEAN:POINTER
BOOLEAN:VOID
FLAGS:OBJECT,OBJECT
FLAGS:STRING,FLAGS
-VOID:BOXED,OBJECT
-VOID:BOXED,POINTER
VOID:STRING,STRING
VOID:UINT64,UINT,UINT,UINT
VOID:UINT,BOXED,UINT,STRING
diff --git a/thunar/thunar-permissions-chooser.c b/thunar/thunar-permissions-chooser.c
index 9eab0d1..3140293 100644
--- a/thunar/thunar-permissions-chooser.c
+++ b/thunar/thunar-permissions-chooser.c
@@ -118,7 +118,9 @@ static void thunar_permissions_chooser_job_start (ThunarP
static gboolean thunar_permissions_chooser_row_separator (GtkTreeModel *model,
GtkTreeIter *iter,
gpointer data);
-
+static GList *thunar_permissions_chooser_get_files (ThunarPermissionsChooser *chooser);
+static void thunar_permissions_chooser_set_files (ThunarPermissionsChooser *chooser,
+ GList *files);
struct _ThunarPermissionsChooserClass
@@ -1326,21 +1328,6 @@ thunar_permissions_chooser_row_separator (GtkTreeModel *model,
/**
- * thunar_permissions_chooser_new:
- *
- * Allocates a new #ThunarPermissionsChooser instance.
- *
- * Return value: the newly allocated #ThunarPermissionsChooser.
- **/
-GtkWidget*
-thunar_permissions_chooser_new (void)
-{
- return g_object_new (THUNAR_TYPE_PERMISSIONS_CHOOSER, NULL);
-}
-
-
-
-/**
* thunar_permissions_chooser_get_files:
* @chooser : a #ThunarPermissionsChooser.
*
@@ -1408,3 +1395,16 @@ thunar_permissions_chooser_set_files (ThunarPermissionsChooser *chooser,
}
+
+/**
+ * thunar_permissions_chooser_new:
+ *
+ * Allocates a new #ThunarPermissionsChooser instance.
+ *
+ * Return value: the newly allocated #ThunarPermissionsChooser.
+ **/
+GtkWidget*
+thunar_permissions_chooser_new (void)
+{
+ return g_object_new (THUNAR_TYPE_PERMISSIONS_CHOOSER, NULL);
+}
diff --git a/thunar/thunar-permissions-chooser.h b/thunar/thunar-permissions-chooser.h
index db72ad9..bc9aebe 100644
--- a/thunar/thunar-permissions-chooser.h
+++ b/thunar/thunar-permissions-chooser.h
@@ -38,10 +38,6 @@ GType thunar_permissions_chooser_get_type (void) G_GNUC_CONST;
GtkWidget *thunar_permissions_chooser_new (void) G_GNUC_MALLOC;
-GList *thunar_permissions_chooser_get_files (ThunarPermissionsChooser *chooser);
-void thunar_permissions_chooser_set_files (ThunarPermissionsChooser *chooser,
- GList *files);
-
G_END_DECLS;
#endif /* !__THUNAR_PERMISSIONS_CHOOSER_H__ */
diff --git a/thunar/thunar-progress-view.c b/thunar/thunar-progress-view.c
index 7a3d15a..60ab64c 100644
--- a/thunar/thunar-progress-view.c
+++ b/thunar/thunar-progress-view.c
@@ -74,6 +74,9 @@ static void thunar_progress_view_info_message (ThunarProgressView *
static void thunar_progress_view_percent (ThunarProgressView *view,
gdouble percent,
ExoJob *job);
+static ThunarJob *thunar_progress_view_get_job (ThunarProgressView *view);
+static void thunar_progress_view_set_job (ThunarProgressView *view,
+ ThunarJob *job);
@@ -517,21 +520,6 @@ thunar_progress_view_percent (ThunarProgressView *view,
/**
- * thunar_progress_view_new:
- *
- * Allocates a new #ThunarProgressView.
- *
- * Return value: the newly allocated #ThunarProgressView.
- **/
-GtkWidget*
-thunar_progress_view_new (void)
-{
- return thunar_progress_view_new_with_job (NULL);
-}
-
-
-
-/**
* thunar_progress_view_new_with_job:
* @job : a #ThunarJob or %NULL.
*
@@ -557,7 +545,7 @@ thunar_progress_view_new_with_job (ThunarJob *job)
*
* Return value: the job associated with @view or %NULL.
**/
-ThunarJob *
+static ThunarJob *
thunar_progress_view_get_job (ThunarProgressView *view)
{
_thunar_return_val_if_fail (THUNAR_IS_PROGRESS_VIEW (view), NULL);
@@ -573,7 +561,7 @@ thunar_progress_view_get_job (ThunarProgressView *view)
*
* Associates @job with @view.
**/
-void
+static void
thunar_progress_view_set_job (ThunarProgressView *view,
ThunarJob *job)
{
diff --git a/thunar/thunar-progress-view.h b/thunar/thunar-progress-view.h
index 096a44c..6cadac6 100644
--- a/thunar/thunar-progress-view.h
+++ b/thunar/thunar-progress-view.h
@@ -39,12 +39,8 @@ typedef struct _ThunarProgressView ThunarProgressView;
GType thunar_progress_view_get_type (void) G_GNUC_CONST;
-GtkWidget *thunar_progress_view_new (void) G_GNUC_MALLOC;
GtkWidget *thunar_progress_view_new_with_job (ThunarJob *job) G_GNUC_MALLOC;
-ThunarJob *thunar_progress_view_get_job (ThunarProgressView *view);
-void thunar_progress_view_set_job (ThunarProgressView *view,
- ThunarJob *job);
void thunar_progress_view_set_icon_name (ThunarProgressView *view,
const gchar *icon_name);
void thunar_progress_view_set_title (ThunarProgressView *view,
diff --git a/thunar/thunar-properties-dialog.c b/thunar/thunar-properties-dialog.c
index 142d514..fef4417 100644
--- a/thunar/thunar-properties-dialog.c
+++ b/thunar/thunar-properties-dialog.c
@@ -97,7 +97,7 @@ static void thunar_properties_dialog_icon_button_clicked (GtkWidget
ThunarPropertiesDialog *dialog);
static void thunar_properties_dialog_update (ThunarPropertiesDialog *dialog);
static void thunar_properties_dialog_update_providers (ThunarPropertiesDialog *dialog);
-
+static GList *thunar_properties_dialog_get_files (ThunarPropertiesDialog *dialog);
struct _ThunarPropertiesDialogClass
@@ -1321,7 +1321,7 @@ thunar_properties_dialog_new (GtkWindow *parent)
* Return value: list of #ThunarFile's displayed by @dialog
* or %NULL.
**/
-GList*
+static GList*
thunar_properties_dialog_get_files (ThunarPropertiesDialog *dialog)
{
_thunar_return_val_if_fail (THUNAR_IS_PROPERTIES_DIALOG (dialog), NULL);
diff --git a/thunar/thunar-properties-dialog.h b/thunar/thunar-properties-dialog.h
index 3e8951f..1a88ede 100644
--- a/thunar/thunar-properties-dialog.h
+++ b/thunar/thunar-properties-dialog.h
@@ -38,7 +38,6 @@ GType thunar_properties_dialog_get_type (void) G_GNUC_CONST;
GtkWidget *thunar_properties_dialog_new (GtkWindow *parent);
-GList *thunar_properties_dialog_get_files (ThunarPropertiesDialog *dialog);
void thunar_properties_dialog_set_files (ThunarPropertiesDialog *dialog,
GList *files);
diff --git a/thunar/thunar-renamer-dialog.c b/thunar/thunar-renamer-dialog.c
index 905a951..4a50ea4 100644
--- a/thunar/thunar-renamer-dialog.c
+++ b/thunar/thunar-renamer-dialog.c
@@ -64,73 +64,80 @@ enum
-static void thunar_renamer_dialog_dispose (GObject *object);
-static void thunar_renamer_dialog_finalize (GObject *object);
-static void thunar_renamer_dialog_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void thunar_renamer_dialog_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void thunar_renamer_dialog_realize (GtkWidget *widget);
-static void thunar_renamer_dialog_unrealize (GtkWidget *widget);
-static void thunar_renamer_dialog_response (GtkDialog *dialog,
- gint response);
-static void thunar_renamer_dialog_context_menu (ThunarRenamerDialog *renamer_dialog,
- guint button,
- guint32 timestamp);
-static void thunar_renamer_dialog_help (ThunarRenamerDialog *renamer_dialog);
-static void thunar_renamer_dialog_save (ThunarRenamerDialog *renamer_dialog);
-static void thunar_renamer_dialog_action_add_files (GtkAction *action,
- ThunarRenamerDialog *renamer_dialog);
-static void thunar_renamer_dialog_action_remove_files (GtkAction *action,
- ThunarRenamerDialog *renamer_dialog);
-static void thunar_renamer_dialog_action_clear (GtkAction *action,
- ThunarRenamerDialog *renamer_dialog);
-static void thunar_renamer_dialog_action_about (GtkAction *action,
- ThunarRenamerDialog *renamer_dialog);
-static void thunar_renamer_dialog_action_properties (GtkAction *action,
- ThunarRenamerDialog *renamer_dialog);
-static gboolean thunar_renamer_dialog_button_press_event (GtkWidget *tree_view,
- GdkEventButton *event,
- ThunarRenamerDialog *renamer_dialog);
-static void thunar_renamer_dialog_drag_data_received (GtkWidget *tree_view,
- GdkDragContext *context,
- gint x,
- gint y,
- GtkSelectionData *selection_data,
- guint info,
- guint timestamp,
- ThunarRenamerDialog *renamer_dialog);
-static void thunar_renamer_dialog_drag_leave (GtkWidget *tree_view,
- GdkDragContext *context,
- guint timestamp,
- ThunarRenamerDialog *renamer_dialog);
-static gboolean thunar_renamer_dialog_drag_motion (GtkWidget *tree_view,
- GdkDragContext *context,
- gint x,
- gint y,
- guint timestamp,
- ThunarRenamerDialog *renamer_dialog);
-static gboolean thunar_renamer_dialog_drag_drop (GtkWidget *tree_view,
- GdkDragContext *context,
- gint x,
- gint y,
- guint timestamp,
- ThunarRenamerDialog *renamer_dialog);
-static void thunar_renamer_dialog_notify_page (GtkNotebook *notebook,
- GParamSpec *pspec,
- ThunarRenamerDialog *renamer_dialog);
-static gboolean thunar_renamer_dialog_popup_menu (GtkWidget *tree_view,
- ThunarRenamerDialog *renamer_dialog);
-static void thunar_renamer_dialog_row_activated (GtkTreeView *tree_view,
- GtkTreePath *path,
- GtkTreeViewColumn *column,
- ThunarRenamerDialog *renamer_dialog);
-static void thunar_renamer_dialog_selection_changed (GtkTreeSelection *selection,
- ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_dispose (GObject *object);
+static void thunar_renamer_dialog_finalize (GObject *object);
+static void thunar_renamer_dialog_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void thunar_renamer_dialog_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void thunar_renamer_dialog_realize (GtkWidget *widget);
+static void thunar_renamer_dialog_unrealize (GtkWidget *widget);
+static void thunar_renamer_dialog_response (GtkDialog *dialog,
+ gint response);
+static void thunar_renamer_dialog_context_menu (ThunarRenamerDialog *renamer_dialog,
+ guint button,
+ guint32 timestamp);
+static void thunar_renamer_dialog_help (ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_save (ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_action_add_files (GtkAction *action,
+ ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_action_remove_files (GtkAction *action,
+ ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_action_clear (GtkAction *action,
+ ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_action_about (GtkAction *action,
+ ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_action_properties (GtkAction *action,
+ ThunarRenamerDialog *renamer_dialog);
+static gboolean thunar_renamer_dialog_button_press_event (GtkWidget *tree_view,
+ GdkEventButton *event,
+ ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_drag_data_received (GtkWidget *tree_view,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint timestamp,
+ ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_drag_leave (GtkWidget *tree_view,
+ GdkDragContext *context,
+ guint timestamp,
+ ThunarRenamerDialog *renamer_dialog);
+static gboolean thunar_renamer_dialog_drag_motion (GtkWidget *tree_view,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint timestamp,
+ ThunarRenamerDialog *renamer_dialog);
+static gboolean thunar_renamer_dialog_drag_drop (GtkWidget *tree_view,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint timestamp,
+ ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_notify_page (GtkNotebook *notebook,
+ GParamSpec *pspec,
+ ThunarRenamerDialog *renamer_dialog);
+static gboolean thunar_renamer_dialog_popup_menu (GtkWidget *tree_view,
+ ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_row_activated (GtkTreeView *tree_view,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_selection_changed (GtkTreeSelection *selection,
+ ThunarRenamerDialog *renamer_dialog);
+static ThunarFile *thunar_renamer_dialog_get_current_directory (ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_set_current_directory (ThunarRenamerDialog *renamer_dialog,
+ ThunarFile *current_directory);
+static GList *thunar_renamer_dialog_get_selected_files (ThunarRenamerDialog *renamer_dialog);
+static gboolean thunar_renamer_dialog_get_standalone (ThunarRenamerDialog *renamer_dialog);
+static void thunar_renamer_dialog_set_standalone (ThunarRenamerDialog *renamer_dialog,
+ gboolean fixed);
@@ -1651,22 +1658,6 @@ thunar_renamer_dialog_selection_changed (GtkTreeSelection *selection,
/**
- * thunar_renamer_dialog_new:
- *
- * Allocates a new #ThunarRenamerDialog instance.
- *
- * Return value: the newly allocated #ThunarRenamerDialog
- * instance.
- **/
-GtkWidget*
-thunar_renamer_dialog_new (void)
-{
- return g_object_new (THUNAR_TYPE_RENAMER_DIALOG, NULL);
-}
-
-
-
-/**
* thunar_renamer_dialog_get_current_directory:
* @renamer_dialog : a #ThunarRenamerDialog.
*
@@ -1677,7 +1668,7 @@ thunar_renamer_dialog_new (void)
*
* Return value: the current directory for @renamer_dialog.
**/
-ThunarFile*
+static ThunarFile*
thunar_renamer_dialog_get_current_directory (ThunarRenamerDialog *renamer_dialog)
{
_thunar_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), NULL);
@@ -1696,7 +1687,7 @@ thunar_renamer_dialog_get_current_directory (ThunarRenamerDialog *renamer_dialog
* is %NULL, the current directory of the file manager process
* will be used.
**/
-void
+static void
thunar_renamer_dialog_set_current_directory (ThunarRenamerDialog *renamer_dialog,
ThunarFile *current_directory)
{
@@ -1733,7 +1724,7 @@ thunar_renamer_dialog_set_current_directory (ThunarRenamerDialog *renamer_dialog
*
* Return value: the list of currently selected files.
**/
-GList*
+static GList*
thunar_renamer_dialog_get_selected_files (ThunarRenamerDialog *renamer_dialog)
{
_thunar_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), NULL);
@@ -1752,7 +1743,7 @@ thunar_renamer_dialog_get_selected_files (ThunarRenamerDialog *renamer_dialog)
*
* Return value: %TRUE if @renamer_dialog is standalone.
**/
-gboolean
+static gboolean
thunar_renamer_dialog_get_standalone (ThunarRenamerDialog *renamer_dialog)
{
_thunar_return_val_if_fail (THUNAR_IS_RENAMER_DIALOG (renamer_dialog), FALSE);
@@ -1770,7 +1761,7 @@ thunar_renamer_dialog_get_standalone (ThunarRenamerDialog *renamer_dialog)
* toolbar and several other actions that do not make sense
* when opened from within the file manager.
**/
-void
+static void
thunar_renamer_dialog_set_standalone (ThunarRenamerDialog *renamer_dialog,
gboolean standalone)
{
diff --git a/thunar/thunar-renamer-dialog.h b/thunar/thunar-renamer-dialog.h
index 66ab323..bb96f49 100644
--- a/thunar/thunar-renamer-dialog.h
+++ b/thunar/thunar-renamer-dialog.h
@@ -36,18 +36,6 @@ typedef struct _ThunarRenamerDialog ThunarRenamerDialog;
GType thunar_renamer_dialog_get_type (void) G_GNUC_CONST;
-GtkWidget *thunar_renamer_dialog_new (void) G_GNUC_MALLOC;
-
-ThunarFile *thunar_renamer_dialog_get_current_directory (ThunarRenamerDialog *renamer_dialog);
-void thunar_renamer_dialog_set_current_directory (ThunarRenamerDialog *renamer_dialog,
- ThunarFile *current_directory);
-
-GList *thunar_renamer_dialog_get_selected_files (ThunarRenamerDialog *renamer_dialog);
-
-gboolean thunar_renamer_dialog_get_standalone (ThunarRenamerDialog *renamer_dialog);
-void thunar_renamer_dialog_set_standalone (ThunarRenamerDialog *renamer_dialog,
- gboolean fixed);
-
void thunar_show_renamer_dialog (gpointer parent,
ThunarFile *current_directory,
GList *files,
diff --git a/thunar/thunar-renamer-model.c b/thunar/thunar-renamer-model.c
index f8a992f..a85453d 100644
--- a/thunar/thunar-renamer-model.c
+++ b/thunar/thunar-renamer-model.c
@@ -123,6 +123,12 @@ static void thunar_renamer_model_item_free (gpointe
static gint thunar_renamer_model_cmp_array (gconstpointer pointer_a,
gconstpointer pointer_b,
gpointer user_data);
+static gboolean thunar_renamer_model_get_can_rename (ThunarRenamerModel *renamer_model);
+static gboolean thunar_renamer_model_get_frozen (ThunarRenamerModel *renamer_model);
+static void thunar_renamer_model_set_frozen (ThunarRenamerModel *renamer_model,
+ gboolean frozen);
+static void thunar_renamer_model_set_mode (ThunarRenamerModel *renamer_model,
+ ThunarRenamerMode mode);
@@ -1034,7 +1040,7 @@ thunar_renamer_model_new (void)
*
* Return value: %TRUE if bulk rename can be performed.
**/
-gboolean
+static gboolean
thunar_renamer_model_get_can_rename (ThunarRenamerModel *renamer_model)
{
gboolean can_rename = FALSE;
@@ -1072,7 +1078,7 @@ thunar_renamer_model_get_can_rename (ThunarRenamerModel *renamer_model)
*
* Return value: %TRUE if @renamer_model is frozen.
**/
-gboolean
+static gboolean
thunar_renamer_model_get_frozen (ThunarRenamerModel *renamer_model)
{
_thunar_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
@@ -1090,7 +1096,7 @@ thunar_renamer_model_get_frozen (ThunarRenamerModel *renamer_model)
* and no updates will be processed until you call this method again with a
* value of %FALSE for @frozen.
**/
-void
+static void
thunar_renamer_model_set_frozen (ThunarRenamerModel *renamer_model,
gboolean frozen)
{
@@ -1154,7 +1160,7 @@ thunar_renamer_model_get_mode (ThunarRenamerModel *renamer_model)
* Sets the rename operation mode of @renamer_model
* to @mode and updates all items.
**/
-void
+static void
thunar_renamer_model_set_mode (ThunarRenamerModel *renamer_model,
ThunarRenamerMode mode)
{
diff --git a/thunar/thunar-renamer-model.h b/thunar/thunar-renamer-model.h
index 7d8a68a..ffc6763 100644
--- a/thunar/thunar-renamer-model.h
+++ b/thunar/thunar-renamer-model.h
@@ -57,15 +57,7 @@ GType thunar_renamer_model_get_type (void) G_GNUC_CONST;
ThunarRenamerModel *thunar_renamer_model_new (void) G_GNUC_MALLOC;
-gboolean thunar_renamer_model_get_can_rename (ThunarRenamerModel *renamer_model);
-
-gboolean thunar_renamer_model_get_frozen (ThunarRenamerModel *renamer_model);
-void thunar_renamer_model_set_frozen (ThunarRenamerModel *renamer_model,
- gboolean frozen);
-
ThunarRenamerMode thunar_renamer_model_get_mode (ThunarRenamerModel *renamer_model);
-void thunar_renamer_model_set_mode (ThunarRenamerModel *renamer_model,
- ThunarRenamerMode mode);
ThunarxRenamer *thunar_renamer_model_get_renamer (ThunarRenamerModel *renamer_model);
void thunar_renamer_model_set_renamer (ThunarRenamerModel *renamer_model,
diff --git a/thunar/thunar-renamer-pair.c b/thunar/thunar-renamer-pair.c
index 8d26d8f..422fbea 100644
--- a/thunar/thunar-renamer-pair.c
+++ b/thunar/thunar-renamer-pair.c
@@ -26,6 +26,10 @@
+static ThunarRenamerPair *thunar_renamer_pair_copy (ThunarRenamerPair *renamer_pair) G_GNUC_MALLOC;
+
+
+
GType
thunar_renamer_pair_get_type (void)
{
@@ -87,7 +91,7 @@ thunar_renamer_pair_new (ThunarFile *file,
*
* Return value: the newly allocated copy of @renamer_pair.
**/
-ThunarRenamerPair*
+static ThunarRenamerPair*
thunar_renamer_pair_copy (ThunarRenamerPair *renamer_pair)
{
_thunar_return_val_if_fail (renamer_pair != NULL, NULL);
diff --git a/thunar/thunar-renamer-pair.h b/thunar/thunar-renamer-pair.h
index 858d5ff..b85a37a 100644
--- a/thunar/thunar-renamer-pair.h
+++ b/thunar/thunar-renamer-pair.h
@@ -39,7 +39,6 @@ GType thunar_renamer_pair_get_type (void) G_GNUC_CONST;
ThunarRenamerPair *thunar_renamer_pair_new (ThunarFile *file,
const gchar *name) G_GNUC_MALLOC;
-ThunarRenamerPair *thunar_renamer_pair_copy (ThunarRenamerPair *renamer_pair) G_GNUC_MALLOC;
void thunar_renamer_pair_free (gpointer data);
GList *thunar_renamer_pair_list_copy (GList *renamer_pair_list) G_GNUC_MALLOC;
diff --git a/thunar/thunar-shortcuts-pane.c b/thunar/thunar-shortcuts-pane.c
index 4363366..6cbb72f 100644
--- a/thunar/thunar-shortcuts-pane.c
+++ b/thunar/thunar-shortcuts-pane.c
@@ -462,21 +462,3 @@ thunar_shortcuts_pane_action_shortcuts_add (GtkAction *action,
thunar_file_list_free (lp);
}
}
-
-
-
-/**
- * thunar_shortcuts_pane_new:
- *
- * Allocates a new #ThunarShortcutsPane instance.
- *
- * Return value: the newly allocated #ThunarShortcutsPane instance.
- **/
-GtkWidget*
-thunar_shortcuts_pane_new (void)
-{
- return g_object_new (THUNAR_TYPE_SHORTCUTS_PANE, NULL);
-}
-
-
-
diff --git a/thunar/thunar-shortcuts-pane.h b/thunar/thunar-shortcuts-pane.h
index b1776bf..ba63c35 100644
--- a/thunar/thunar-shortcuts-pane.h
+++ b/thunar/thunar-shortcuts-pane.h
@@ -36,8 +36,6 @@ typedef struct _ThunarShortcutsPane ThunarShortcutsPane;
GType thunar_shortcuts_pane_get_type (void) G_GNUC_CONST;
-GtkWidget *thunar_shortcuts_pane_new (void) G_GNUC_MALLOC;
-
G_END_DECLS;
#endif /* !__THUNAR_SHORTCUTS_PANE_H__ */
diff --git a/thunar/thunar-size-label.c b/thunar/thunar-size-label.c
index 679a256..33217b0 100644
--- a/thunar/thunar-size-label.c
+++ b/thunar/thunar-size-label.c
@@ -70,6 +70,9 @@ static void thunar_size_label_status_update (ThunarDeepCountJob *j
guint directory_count,
guint unreadable_directory_count,
ThunarSizeLabel *size_label);
+static GList *thunar_size_label_get_files (ThunarSizeLabel *size_label);
+static void thunar_size_label_set_files (ThunarSizeLabel *size_label,
+ GList *files);
@@ -398,27 +401,12 @@ thunar_size_label_status_update (ThunarDeepCountJob *job,
/**
- * thunar_size_label_new:
- *
- * Allocates a new #ThunarSizeLabel instance.
- *
- * Return value: the newly allocated #ThunarSizeLabel.
- **/
-GtkWidget*
-thunar_size_label_new (void)
-{
- return g_object_new (THUNAR_TYPE_SIZE_LABEL, NULL);
-}
-
-
-
-/**
* thunar_size_label_get_files:
* @size_label : a #ThunarSizeLabel.
*
* Get the files displayed by the @size_label.
**/
-GList*
+static GList*
thunar_size_label_get_files (ThunarSizeLabel *size_label)
{
_thunar_return_val_if_fail (THUNAR_IS_SIZE_LABEL (size_label), NULL);
@@ -434,7 +422,7 @@ thunar_size_label_get_files (ThunarSizeLabel *size_label)
*
* Sets @file as the #ThunarFile displayed by the @size_label.
**/
-void
+static void
thunar_size_label_set_files (ThunarSizeLabel *size_label,
GList *files)
{
@@ -472,3 +460,17 @@ thunar_size_label_set_files (ThunarSizeLabel *size_label,
}
+
+/**
+ * thunar_size_label_new:
+ *
+ * Allocates a new #ThunarSizeLabel instance.
+ *
+ * Return value: the newly allocated #ThunarSizeLabel.
+ **/
+GtkWidget*
+thunar_size_label_new (void)
+{
+ return g_object_new (THUNAR_TYPE_SIZE_LABEL, NULL);
+}
+
diff --git a/thunar/thunar-size-label.h b/thunar/thunar-size-label.h
index 8fa4774..4dc395e 100644
--- a/thunar/thunar-size-label.h
+++ b/thunar/thunar-size-label.h
@@ -38,10 +38,6 @@ GType thunar_size_label_get_type (void) G_GNUC_CONST;
GtkWidget *thunar_size_label_new (void) G_GNUC_MALLOC;
-GList *thunar_size_label_get_files (ThunarSizeLabel *size_label);
-void thunar_size_label_set_files (ThunarSizeLabel *size_label,
- GList *files);
-
G_END_DECLS;
#endif /* !__THUNAR_SIZE_LABEL_H__ */
diff --git a/thunar/thunar-statusbar.c b/thunar/thunar-statusbar.c
index 3b8533b..39ea7c6 100644
--- a/thunar/thunar-statusbar.c
+++ b/thunar/thunar-statusbar.c
@@ -43,7 +43,8 @@ static void thunar_statusbar_set_property (GObject
guint prop_id,
const GValue *value,
GParamSpec *pspec);
-
+static void thunar_statusbar_set_text (ThunarStatusbar *statusbar,
+ const gchar *text);
struct _ThunarStatusbarClass
@@ -131,29 +132,13 @@ thunar_statusbar_set_property (GObject *object,
/**
- * thunar_statusbar_new:
- *
- * Allocates a new #ThunarStatusbar instance with no
- * text set.
- *
- * Return value: the newly allocated #ThunarStatusbar instance.
- **/
-GtkWidget*
-thunar_statusbar_new (void)
-{
- return g_object_new (THUNAR_TYPE_STATUSBAR, NULL);
-}
-
-
-
-/**
* thunar_statusbar_set_text:
* @statusbar : a #ThunarStatusbar instance.
* @text : the main text to be displayed in @statusbar.
*
* Sets up a new main text for @statusbar.
**/
-void
+static void
thunar_statusbar_set_text (ThunarStatusbar *statusbar,
const gchar *text)
{
@@ -166,3 +151,16 @@ thunar_statusbar_set_text (ThunarStatusbar *statusbar,
+/**
+ * thunar_statusbar_new:
+ *
+ * Allocates a new #ThunarStatusbar instance with no
+ * text set.
+ *
+ * Return value: the newly allocated #ThunarStatusbar instance.
+ **/
+GtkWidget*
+thunar_statusbar_new (void)
+{
+ return g_object_new (THUNAR_TYPE_STATUSBAR, NULL);
+}
diff --git a/thunar/thunar-statusbar.h b/thunar/thunar-statusbar.h
index c6d7728..3dca148 100644
--- a/thunar/thunar-statusbar.h
+++ b/thunar/thunar-statusbar.h
@@ -38,9 +38,6 @@ GType thunar_statusbar_get_type (void) G_GNUC_CONST;
GtkWidget *thunar_statusbar_new (void);
-void thunar_statusbar_set_text (ThunarStatusbar *statusbar,
- const gchar *text);
-
G_END_DECLS;
#endif /* !__THUNAR_STATUSBAR_H__ */
diff --git a/thunar/thunar-tree-model.c b/thunar/thunar-tree-model.c
index 6a6ef0b..df7c34d 100644
--- a/thunar/thunar-tree-model.c
+++ b/thunar/thunar-tree-model.c
@@ -160,6 +160,9 @@ static gboolean thunar_tree_model_node_traverse_free (GNode
gpointer user_data);
static gboolean thunar_tree_model_node_traverse_visible (GNode *node,
gpointer user_data);
+static gboolean thunar_tree_model_get_case_sensitive (ThunarTreeModel *model);
+static void thunar_tree_model_set_case_sensitive (ThunarTreeModel *model,
+ gboolean case_sensitive);
@@ -1893,7 +1896,7 @@ thunar_tree_model_get_default (void)
*
* Return value: %TRUE if @model is sorted case-sensitive.
**/
-gboolean
+static gboolean
thunar_tree_model_get_case_sensitive (ThunarTreeModel *model)
{
_thunar_return_val_if_fail (THUNAR_IS_TREE_MODEL (model), FALSE);
@@ -1910,7 +1913,7 @@ thunar_tree_model_get_case_sensitive (ThunarTreeModel *model)
* If @case_sensitive is %TRUE the @model will be sorted
* in a case-sensitive manner.
**/
-void
+static void
thunar_tree_model_set_case_sensitive (ThunarTreeModel *model,
gboolean case_sensitive)
{
diff --git a/thunar/thunar-tree-model.h b/thunar/thunar-tree-model.h
index 4cc7e2e..826fb86 100644
--- a/thunar/thunar-tree-model.h
+++ b/thunar/thunar-tree-model.h
@@ -61,10 +61,6 @@ GType thunar_tree_model_get_type (void) G_GNUC_CONST;
ThunarTreeModel *thunar_tree_model_get_default (void);
-gboolean thunar_tree_model_get_case_sensitive (ThunarTreeModel *model);
-void thunar_tree_model_set_case_sensitive (ThunarTreeModel *model,
- gboolean case_sensitive);
-
void thunar_tree_model_set_visible_func (ThunarTreeModel *model,
ThunarTreeModelVisibleFunc func,
gpointer data);
diff --git a/thunar/thunar-tree-pane.c b/thunar/thunar-tree-pane.c
index 6f9c8e4..ac6e9d0 100644
--- a/thunar/thunar-tree-pane.c
+++ b/thunar/thunar-tree-pane.c
@@ -291,18 +291,3 @@ thunar_tree_pane_set_show_hidden (ThunarSidePane *side_pane,
}
-
-/**
- * thunar_tree_pane_new:
- *
- * Allocates a new #ThunarTreePane instance.
- *
- * Return value: the newly allocated #ThunarTreePane instance.
- **/
-GtkWidget*
-thunar_tree_pane_new (void)
-{
- return g_object_new (THUNAR_TYPE_TREE_PANE, NULL);
-}
-
-
diff --git a/thunar/thunar-tree-pane.h b/thunar/thunar-tree-pane.h
index 9a8f152..2cc7247 100644
--- a/thunar/thunar-tree-pane.h
+++ b/thunar/thunar-tree-pane.h
@@ -36,8 +36,6 @@ typedef struct _ThunarTreePane ThunarTreePane;
GType thunar_tree_pane_get_type (void) G_GNUC_CONST;
-GtkWidget *thunar_tree_pane_new (void) G_GNUC_MALLOC;
-
G_END_DECLS;
#endif /* !__THUNAR_TREE_PANE_H__ */
diff --git a/thunar/thunar-tree-view.c b/thunar/thunar-tree-view.c
index c6a30c4..7e311e7 100644
--- a/thunar/thunar-tree-view.c
+++ b/thunar/thunar-tree-view.c
@@ -188,6 +188,9 @@ static ThunarTreeViewMountData *thunar_tree_view_mount_data_new (T
gboolean open_after_mounting,
gboolean open_in_new_window);
static void thunar_tree_view_mount_data_free (ThunarTreeViewMountData *data);
+static gboolean thunar_tree_view_get_show_hidden (ThunarTreeView *view);
+static void thunar_tree_view_set_show_hidden (ThunarTreeView *view,
+ gboolean show_hidden);
@@ -2486,21 +2489,6 @@ thunar_tree_view_mount_data_free (ThunarTreeViewMountData *data)
/**
- * thunar_tree_view_new:
- *
- * Allocates a new #ThunarTreeView instance.
- *
- * Return value: the newly allocated #ThunarTreeView instance.
- **/
-GtkWidget*
-thunar_tree_view_new (void)
-{
- return g_object_new (THUNAR_TYPE_TREE_VIEW, NULL);
-}
-
-
-
-/**
* thunar_tree_view_get_show_hidden:
* @view : a #ThunarTreeView.
*
@@ -2509,7 +2497,7 @@ thunar_tree_view_new (void)
*
* Return value: %TRUE if hidden folders are shown.
**/
-gboolean
+static gboolean
thunar_tree_view_get_show_hidden (ThunarTreeView *view)
{
_thunar_return_val_if_fail (THUNAR_IS_TREE_VIEW (view), FALSE);
@@ -2526,7 +2514,7 @@ thunar_tree_view_get_show_hidden (ThunarTreeView *view)
* If @show_hidden is %TRUE, @view will shown hidden and
* backup folders. Else, these folders will be hidden.
**/
-void
+static void
thunar_tree_view_set_show_hidden (ThunarTreeView *view,
gboolean show_hidden)
{
@@ -2549,3 +2537,18 @@ thunar_tree_view_set_show_hidden (ThunarTreeView *view,
g_object_notify (G_OBJECT (view), "show-hidden");
}
}
+
+
+
+/**
+ * thunar_tree_view_new:
+ *
+ * Allocates a new #ThunarTreeView instance.
+ *
+ * Return value: the newly allocated #ThunarTreeView instance.
+ **/
+GtkWidget*
+thunar_tree_view_new (void)
+{
+ return g_object_new (THUNAR_TYPE_TREE_VIEW, NULL);
+}
diff --git a/thunar/thunar-tree-view.h b/thunar/thunar-tree-view.h
index fa3dd48..f649aff 100644
--- a/thunar/thunar-tree-view.h
+++ b/thunar/thunar-tree-view.h
@@ -38,10 +38,6 @@ GType thunar_tree_view_get_type (void) G_GNUC_CONST;
GtkWidget *thunar_tree_view_new (void) G_GNUC_MALLOC;
-gboolean thunar_tree_view_get_show_hidden (ThunarTreeView *view);
-void thunar_tree_view_set_show_hidden (ThunarTreeView *view,
- gboolean show_hidden);
-
G_END_DECLS;
#endif /* !__THUNAR_TREE_VIEW_H__ */
diff --git a/thunar/thunar-user.c b/thunar/thunar-user.c
index 5567845..f56704c 100644
--- a/thunar/thunar-user.c
+++ b/thunar/thunar-user.c
@@ -177,10 +177,10 @@ thunar_group_get_name (ThunarGroup *group)
-static void thunar_user_finalize (GObject *object);
-static void thunar_user_load (ThunarUser *user);
-static ThunarUser *thunar_user_new (guint32 id);
-
+static void thunar_user_finalize (GObject *object);
+static void thunar_user_load (ThunarUser *user);
+static ThunarUser *thunar_user_new (guint32 id);
+static ThunarGroup*thunar_user_get_primary_group (ThunarUser *user);
struct _ThunarUserClass
@@ -319,6 +319,19 @@ thunar_user_new (guint32 id)
}
+static ThunarGroup*
+thunar_user_get_primary_group (ThunarUser *user)
+{
+ g_return_val_if_fail (THUNAR_IS_USER (user), NULL);
+
+ /* load the user data on-demand */
+ if (G_UNLIKELY (user->name == NULL))
+ thunar_user_load (user);
+
+ return user->primary_group;
+}
+
+
/**
* thunar_user_get_groups:
@@ -386,49 +399,6 @@ thunar_user_get_groups (ThunarUser *user)
/**
- * thunar_user_get_primary_group:
- * @user : a #ThunarUser.
- *
- * Returns the primary group of @user or %NULL if @user
- * has no primary group.
- *
- * No reference is taken for the caller, so you must
- * not call g_object_unref() on the returned object.
- *
- * Return value: the primary group of @user or %NULL.
- **/
-ThunarGroup*
-thunar_user_get_primary_group (ThunarUser *user)
-{
- g_return_val_if_fail (THUNAR_IS_USER (user), NULL);
-
- /* load the user data on-demand */
- if (G_UNLIKELY (user->name == NULL))
- thunar_user_load (user);
-
- return user->primary_group;
-}
-
-
-
-/**
- * thunar_user_get_id:
- * @user : a #ThunarUser.
- *
- * Returns the unique id of @user.
- *
- * Return value: the unique id of @user.
- **/
-guint32
-thunar_user_get_id (ThunarUser *user)
-{
- g_return_val_if_fail (THUNAR_IS_USER (user), 0);
- return user->id;
-}
-
-
-
-/**
* thunar_user_get_name:
* @user : a #ThunarUser.
*
diff --git a/thunar/thunar-user.h b/thunar/thunar-user.h
index d0e7886..09c8a82 100644
--- a/thunar/thunar-user.h
+++ b/thunar/thunar-user.h
@@ -55,8 +55,6 @@ typedef struct _ThunarUser ThunarUser;
GType thunar_user_get_type (void) G_GNUC_CONST;
GList *thunar_user_get_groups (ThunarUser *user);
-ThunarGroup *thunar_user_get_primary_group (ThunarUser *user);
-guint32 thunar_user_get_id (ThunarUser *user);
const gchar *thunar_user_get_name (ThunarUser *user);
const gchar *thunar_user_get_real_name (ThunarUser *user);
gboolean thunar_user_is_me (ThunarUser *user);
diff --git a/thunar/thunar-window.c b/thunar/thunar-window.c
index b1071e4..bdbde89 100644
--- a/thunar/thunar-window.c
+++ b/thunar/thunar-window.c
@@ -214,6 +214,8 @@ static gboolean thunar_window_merge_idle (gpointer
static void thunar_window_merge_idle_destroy (gpointer user_data);
static gboolean thunar_window_save_geometry_timer (gpointer user_data);
static void thunar_window_save_geometry_timer_destroy (gpointer user_data);
+static void thunar_window_set_zoom_level (ThunarWindow *window,
+ ThunarZoomLevel zoom_level);
@@ -2842,17 +2844,32 @@ thunar_window_save_geometry_timer_destroy (gpointer user_data)
/**
- * thunar_window_new:
- *
- * Allocates a new #ThunarWindow instance, which isn't
- * associated with any directory.
+ * thunar_window_set_zoom_level:
+ * @window : a #ThunarWindow instance.
+ * @zoom_level : the new zoom level for @window.
*
- * Return value: the newly allocated #ThunarWindow instance.
+ * Sets the zoom level for @window to @zoom_level.
**/
-GtkWidget*
-thunar_window_new (void)
+void
+thunar_window_set_zoom_level (ThunarWindow *window,
+ ThunarZoomLevel zoom_level)
{
- return g_object_new (THUNAR_TYPE_WINDOW, NULL);
+ _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
+ _thunar_return_if_fail (zoom_level < THUNAR_ZOOM_N_LEVELS);
+
+ /* check if we have a new zoom level */
+ if (G_LIKELY (window->zoom_level != zoom_level))
+ {
+ /* remember the new zoom level */
+ window->zoom_level = zoom_level;
+
+ /* update the "Zoom In" and "Zoom Out" actions */
+ thunar_gtk_action_group_set_action_sensitive (window->action_group, "zoom-in", (zoom_level < THUNAR_ZOOM_N_LEVELS - 1));
+ thunar_gtk_action_group_set_action_sensitive (window->action_group, "zoom-out", (zoom_level > 0));
+
+ /* notify listeners */
+ g_object_notify (G_OBJECT (window), "zoom-level");
+ }
}
@@ -2990,54 +3007,6 @@ thunar_window_set_current_directory (ThunarWindow *window,
/**
- * thunar_window_get_zoom_level:
- * @window : a #ThunarWindow instance.
- *
- * Returns the #ThunarZoomLevel for @window.
- *
- * Return value: the #ThunarZoomLevel for @indow.
- **/
-ThunarZoomLevel
-thunar_window_get_zoom_level (ThunarWindow *window)
-{
- _thunar_return_val_if_fail (THUNAR_IS_WINDOW (window), THUNAR_ZOOM_LEVEL_NORMAL);
- return window->zoom_level;
-}
-
-
-
-/**
- * thunar_window_set_zoom_level:
- * @window : a #ThunarWindow instance.
- * @zoom_level : the new zoom level for @window.
- *
- * Sets the zoom level for @window to @zoom_level.
- **/
-void
-thunar_window_set_zoom_level (ThunarWindow *window,
- ThunarZoomLevel zoom_level)
-{
- _thunar_return_if_fail (THUNAR_IS_WINDOW (window));
- _thunar_return_if_fail (zoom_level < THUNAR_ZOOM_N_LEVELS);
-
- /* check if we have a new zoom level */
- if (G_LIKELY (window->zoom_level != zoom_level))
- {
- /* remember the new zoom level */
- window->zoom_level = zoom_level;
-
- /* update the "Zoom In" and "Zoom Out" actions */
- thunar_gtk_action_group_set_action_sensitive (window->action_group, "zoom-in", (zoom_level < THUNAR_ZOOM_N_LEVELS - 1));
- thunar_gtk_action_group_set_action_sensitive (window->action_group, "zoom-out", (zoom_level > 0));
-
- /* notify listeners */
- g_object_notify (G_OBJECT (window), "zoom-level");
- }
-}
-
-
-
-/**
* thunar_window_scroll_to_file:
* @window : a #ThunarWindow instance.
* @file : a #ThunarFile.
diff --git a/thunar/thunar-window.h b/thunar/thunar-window.h
index 04c61a0..d78c6e8 100644
--- a/thunar/thunar-window.h
+++ b/thunar/thunar-window.h
@@ -37,16 +37,10 @@ typedef struct _ThunarWindow ThunarWindow;
GType thunar_window_get_type (void) G_GNUC_CONST;
-GtkWidget *thunar_window_new (void);
-
ThunarFile *thunar_window_get_current_directory (ThunarWindow *window);
void thunar_window_set_current_directory (ThunarWindow *window,
ThunarFile *current_directory);
-ThunarZoomLevel thunar_window_get_zoom_level (ThunarWindow *window);
-void thunar_window_set_zoom_level (ThunarWindow *window,
- ThunarZoomLevel zoom_level);
-
void thunar_window_scroll_to_file (ThunarWindow *window,
ThunarFile *file,
gboolean select,
More information about the Xfce4-commits
mailing list