Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mloskot/libfm
...
head fork: mloskot/libfm
Checking mergeability… Don't worry, you can still create the pull request.
  • 7 commits
  • 10 files changed
  • 0 commit comments
  • 3 contributors
View
1  docs/reference/libfm/libfm-sections.txt
@@ -339,6 +339,7 @@ fm_dnd_unset_dest_auto_scroll
<SECTION>
<FILE>fm-dnd-dest</FILE>
<TITLE>FmDndDest</TITLE>
+FmDndDest
FmDndDestClass
fm_dnd_dest_drag_data_received
fm_dnd_dest_drag_drop
View
50 po/nl.po
@@ -8,14 +8,15 @@ msgstr ""
"Project-Id-Version: libfm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-07-08 22:52+0200\n"
-"PO-Revision-Date: 2011-11-27 11:12+0200\n"
-"Last-Translator: Pjotr\n"
+"PO-Revision-Date: 2012-07-09 11:26+0200\n"
+"Last-Translator: Pjotr <pjotrvertaalt@gmail.com>\n"
"Language-Team: Dutch\n"
-"Language: nl (Dutch)\n"
+"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
#: ../data/ui/app-chooser.glade.h:1
msgid "Choose An Application"
@@ -155,44 +156,40 @@ msgid "<b>_Group:</b>"
msgstr "<b>_Groep:</b>"
#: ../data/ui/file-prop.glade.h:14
-#, fuzzy
msgid "<b>View content:</b>"
-msgstr "<b>E-mailprogramma</b>"
+msgstr "<b>Inhoud bekijken:</b>"
#: ../data/ui/file-prop.glade.h:15
-#, fuzzy
msgid "<b>Change content:</b>"
-msgstr "<b>Doel:</b>"
+msgstr "<b>Inhoud veranderen:</b>"
#: ../data/ui/file-prop.glade.h:16
-#, fuzzy
msgid "<b>Execute:</b>"
-msgstr "<b>Andere:</b>"
+msgstr "<b>Uitvoeren:</b>"
#: ../data/ui/file-prop.glade.h:17
-#, fuzzy
msgid "<b>Special bits:</b>"
-msgstr "<b>Openen _met:</b>"
+msgstr "<b>Speciale bits:</b>"
#: ../data/ui/file-prop.glade.h:18
msgid "Who can read content of the file/directory"
-msgstr ""
+msgstr "Wie de inhoud van het bestand of de map kan lezen"
#: ../data/ui/file-prop.glade.h:19
msgid "Who can change content of the file/directory"
-msgstr ""
+msgstr "Wie de inhoud van het bestand of de map kan veranderen"
#: ../data/ui/file-prop.glade.h:20
msgid "Who can execute the file or enter the directory"
-msgstr ""
+msgstr "Wie het bestand kan uitvoeren of de map kan binnengaan"
#: ../data/ui/file-prop.glade.h:21
msgid "Special flags for file execution"
-msgstr ""
+msgstr "Speciale vlaggen voor het uitvoeren van bestanden"
#: ../data/ui/file-prop.glade.h:22
msgid "Special flags for directory access"
-msgstr ""
+msgstr "Speciale vlaggen voor maptoegang"
#: ../data/ui/file-prop.glade.h:23
msgid "<b>Access Control</b>"
@@ -212,39 +209,39 @@ msgstr "Geen"
#: ../data/ui/file-prop.glade.h:27
msgid "Sticky"
-msgstr ""
+msgstr "Klevend"
#: ../data/ui/file-prop.glade.h:28
msgid "Set GID"
-msgstr ""
+msgstr "Stel GID in"
#: ../data/ui/file-prop.glade.h:29
msgid "Sticky & set GID"
-msgstr ""
+msgstr "Klevend en stel GID in"
#: ../data/ui/file-prop.glade.h:30
msgid "Set UID"
-msgstr ""
+msgstr "Stel UID in"
#: ../data/ui/file-prop.glade.h:31
msgid "Set UID & GID"
-msgstr ""
+msgstr "Stel UID en GID in"
#: ../data/ui/file-prop.glade.h:32
msgid "Nobody"
-msgstr ""
+msgstr "Niemand"
#: ../data/ui/file-prop.glade.h:33
msgid "Only owner"
-msgstr ""
+msgstr "Alleen de eigenaar"
#: ../data/ui/file-prop.glade.h:34
msgid "Only owner and group"
-msgstr ""
+msgstr "Alleen de eigenaar en de groep"
#: ../data/ui/file-prop.glade.h:35
msgid "Anyone"
-msgstr ""
+msgstr "Iedereen"
#. Preparing to do some file operation (Copy, Move, Delete...)
#: ../data/ui/progress.glade.h:2
@@ -486,9 +483,8 @@ msgstr ""
"Wilt u deze veranderingen recursief toepassen op alle bestanden en submappen?"
#: ../src/gtk/fm-file-properties.c:624
-#, fuzzy
msgid "<b>Access content:</b>"
-msgstr "<b>Toegangcontrole</b>"
+msgstr "<b>Inhoud benaderen:</b>"
#: ../src/gtk/fm-file-properties.c:739
msgid "Files of different types"
View
40 src/job/fm-deep-count-job.c
@@ -19,6 +19,20 @@
* MA 02110-1301, USA.
*/
+/**
+ * SECTION:fm-deep-count-job
+ * @short_description: Job to gather information about file sizes.
+ * @title: FmDeepCountJob
+ *
+ * @include: libfm/fm-deep-count-job.h
+ *
+ * The #FmDeepCountJob can be used to recursively gather information about
+ * some files and directories content before copy or move. It counts total
+ * size of all given files and directories, and size on disk for them.
+ * If flags for the job include FM_DC_JOB_PREPARE_MOVE then also count of
+ * files to move between volumes will be counted as well.
+ */
+
#include "fm-deep-count-job.h"
#include <glib/gstdio.h>
#include <errno.h>
@@ -75,7 +89,17 @@ static void fm_deep_count_job_init(FmDeepCountJob *self)
fm_job_init_cancellable(FM_JOB(self));
}
-
+/**
+ * fm_deep_count_job_new
+ * @paths: list of files and directories to count sizes
+ * @flags: flags of the counting behavior
+ *
+ * Creates a new #FmDeepCountJob which can be ran via #FmJob API.
+ *
+ * Returns: (transfer full): a new #FmDeepCountJob object.
+ *
+ * Since: 0.1.0
+ */
FmDeepCountJob *fm_deep_count_job_new(FmPathList* paths, FmDeepCountJobFlags flags)
{
FmDeepCountJob* job = (FmDeepCountJob*)g_object_new(FM_DEEP_COUNT_JOB_TYPE, NULL);
@@ -318,7 +342,19 @@ static gboolean deep_count_gio(FmDeepCountJob* job, GFileInfo* inf, GFile* gf)
return TRUE;
}
-/* dev is UNIX device ID. fs_id is filesystem id in gio format (can be NULL). */
+/**
+ * fm_deep_count_job_set_dest
+ * @dc: a job to set the destination
+ * @dev: UNIX device ID
+ * @fs_id: (allow-none): filesystem id in gio format
+ *
+ * Sets destination for the job @dc that will be used when the job is
+ * ran with any of flags FM_DC_JOB_SAME_FS or FM_DC_JOB_PREPARE_MOVE.
+ * If @dev is 0 (and @fs_id is NULL) then destination device is non on
+ * native filesystem.
+ *
+ * Since: 0.1.0
+ */
void fm_deep_count_job_set_dest(FmDeepCountJob* dc, dev_t dev, const char* fs_id)
{
dc->dest_dev = dev;
View
4 src/job/fm-deep-count-job.h
@@ -53,6 +53,7 @@ typedef enum {
struct _FmDeepCountJob
{
+ /*< public >*/
FmJob parent;
FmPathList* paths;
FmDeepCountJobFlags flags;
@@ -60,7 +61,8 @@ struct _FmDeepCountJob
goffset total_ondisk_size;
guint count;
- /* private: used to count total size used when moving files */
+ /*< private >*/
+ /* used to count total size used when moving files */
dev_t dest_dev;
const char* dest_fs_id;
};
View
49 src/job/fm-dir-list-job.c
@@ -19,6 +19,17 @@
* MA 02110-1301, USA.
*/
+/**
+ * SECTION:fm-dir-list-job
+ * @short_description: Job to get listing of directory.
+ * @title: FmDirListJob
+ *
+ * @include: libfm/fm-dir-list-job.h
+ *
+ * The #FmDirListJob can be used to gather list of #FmFileInfo that some
+ * directory contains.
+ */
+
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -56,19 +67,41 @@ static void fm_dir_list_job_class_init(FmDirListJobClass *klass)
static void fm_dir_list_job_init(FmDirListJob *self)
{
+ job->files = fm_file_info_list_new();
fm_job_init_cancellable(FM_JOB(self));
}
-
+/**
+ * fm_dir_list_job_new
+ * @path: path to directory to get listing
+ * @dir_only: %TRUE to include only directories in the list
+ *
+ * Creates a new #FmDirListJob for directory listing. If @dir_only is
+ * %TRUE then objects other than directories will be omitted from the
+ * listing.
+ *
+ * Returns: (transfer full): a new #FmDirListJob object.
+ *
+ * Since: 0.1.0
+ */
FmDirListJob* fm_dir_list_job_new(FmPath* path, gboolean dir_only)
{
FmDirListJob* job = (FmDirListJob*)g_object_new(FM_TYPE_DIR_LIST_JOB, NULL);
job->dir_path = fm_path_ref(path);
job->dir_only = dir_only;
- job->files = fm_file_info_list_new();
return job;
}
+/**
+ * fm_dir_list_job_new_for_gfile
+ * @gf: descriptor of directory to get listing
+ *
+ * Creates a new #FmDirListJob for listing of directory @gf.
+ *
+ * Returns: (transfer full): a new #FmDirListJob object.
+ *
+ * Since: 0.1.0
+ */
FmDirListJob* fm_dir_list_job_new_for_gfile(GFile* gf)
{
/* FIXME: should we cache this with hash table? Or, the cache
@@ -432,6 +465,18 @@ static gboolean fm_dir_list_job_run(FmJob* fmjob)
return ret;
}
+/**
+ * fm_dir_dist_job_get_files
+ * @job: the job that collected listing
+ *
+ * Retrieves gathered listing from the @job. This function may be called
+ * only from #FmJob::finished signal handler. Returned data is owned by
+ * the @job and should be not freed by caller.
+ *
+ * Returns: (transfer none): list of gathered data.
+ *
+ * Since: 0.1.0
+ */
FmFileInfoList* fm_dir_dist_job_get_files(FmDirListJob* job)
{
return job->files;
View
1  src/job/fm-dir-list-job.h
@@ -44,6 +44,7 @@ typedef struct _FmDirListJobClass FmDirListJobClass;
struct _FmDirListJob
{
+ /*< public >*/
FmJob parent;
FmPath* dir_path;
gboolean dir_only;
View
10 src/job/fm-job.c
@@ -278,7 +278,9 @@ static gboolean fm_job_real_run_async(FmJob* job)
*
* Starts the @job asyncronously creating new thread. If job starts
* successfully then the #FmJob::finished signal will be emitted when
- * @job is either succeeded, failed, or was cancelled.
+ * @job is either succeeded or was cancelled. If @job could not be
+ * started then #FmJob::cancelled signal is emitted before return from
+ * this function.
*
* Returns: %TRUE if job started successfully.
*
@@ -304,7 +306,7 @@ gboolean fm_job_run_async(FmJob* job)
* @job: a job to run
*
* Runs the @job in current thread in a blocking fashion. The job will
- * emit either #FmJob::cancelled signal if job failed or was cancelled
+ * emit either #FmJob::cancelled signal if job was cancelled
* or #FmJob::finished signal if it finished successfully.
*
* Returns: %TRUE if @job ran successfully.
@@ -339,7 +341,7 @@ static void on_sync_job_finished(FmJob* job, GMainLoop* mainloop)
* Runs the @job in current thread in a blocking fashion and an additional
* mainloop being created to prevent blocking of user interface. If @job
* started successfully then #FmJob::finished signal is emitted when @job
- * is either succeeded, failed, or was cancelled.
+ * is either succeeded or was cancelled.
*
* Returns: %TRUE if job started successfully.
*
@@ -354,8 +356,8 @@ gboolean fm_job_run_sync_with_mainloop(FmJob* job)
if(G_LIKELY(ret))
{
g_main_loop_run(mainloop);
- g_signal_handlers_disconnect_by_func(job, on_sync_job_finished, mainloop);
}
+ g_signal_handlers_disconnect_by_func(job, on_sync_job_finished, mainloop);
g_main_loop_unref(mainloop);
return ret;
}
View
7 src/job/fm-job.h
@@ -99,10 +99,11 @@ struct _FmJob
* @cancelled: the class closure for the #FmJob::cancelled signal.
* @ask: the class closure for the #FmJob::ask signal.
* @run_async: the @run_async function called to create a thread for
- * job execution. The most probably should be not overridden by any
- * derived class.
+ * job execution. Returns %TRUE if thread was created successfully.
+ * The most probably should be not overridden by any derived class.
* @run: the @run function is called to perform actual job actions.
- * Should be set by any class that derived from #FmJob.
+ * Returns value that will be returned from call fm_job_run_sync().
+ * Should be set by any class derived from #FmJob.
* @cancel: the @cancel function is called when the job is cancelled.
* It can perform some class-specific operations then.
*/
View
24 src/job/fm-simple-job.c
@@ -19,6 +19,17 @@
* MA 02110-1301, USA.
*/
+/**
+ * SECTION:fm-simple-job
+ * @short_description: Job to run a function asynchronously.
+ * @title: FmSimpleJob
+ *
+ * @include: libfm/fm-simple-job.h
+ *
+ * The #FmJob can be used to create asynchronous job which just run some
+ * simple function with provided data.
+ */
+
#include "fm-simple-job.h"
#define FM_TYPE_SIMPLE_JOB (fm_simple_job_get_type())
@@ -84,7 +95,18 @@ static void fm_simple_job_init(FmSimpleJob *self)
}
-
+/**
+ * fm_simple_job_new
+ * @func: user function to run asynchronously
+ * @user_data: user data provided for @func
+ * @destroy_data: user function to free data after job finished
+ *
+ * Creates a new simple #FmJob for user task.
+ *
+ * Returns: (transfer full): a new #FmJob object.
+ *
+ * Since: 0.1.0
+ */
FmJob* fm_simple_job_new(FmSimpleJobFunc func, gpointer user_data, GDestroyNotify destroy_data)
{
FmSimpleJob* job = (FmSimpleJob*)g_object_new(FM_TYPE_SIMPLE_JOB, NULL);
View
11 src/job/fm-simple-job.h
@@ -27,7 +27,16 @@
G_BEGIN_DECLS
-typedef gboolean (*FmSimpleJobFunc)(FmJob*, gpointer);
+/**
+ * FmSimpleJobFunc
+ * @job: the job object
+ * @user_data: user data provided on fm_simple_job_new() call
+ *
+ * The user function which will be ran asynchronously by #FmJob API.
+ *
+ * Return value: value to return from fm_job_run_sync().
+ */
+typedef gboolean (*FmSimpleJobFunc)(FmJob* job, gpointer user_data);
GType fm_simple_job_get_type(void);
FmJob* fm_simple_job_new(FmSimpleJobFunc func, gpointer user_data, GDestroyNotify destroy_data);

No commit comments for this range

Something went wrong with that request. Please try again.