[nautilus-actions/file-manager-actions] nadp_writer_xxx are renamed to fma_desktop_writer_xxx
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] nadp_writer_xxx are renamed to fma_desktop_writer_xxx
- Date: Tue, 8 Sep 2015 14:46:58 +0000 (UTC)
commit 7866b5a8e0ee98fa4dd95129321e21135e304cee
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Sep 8 16:34:47 2015 +0200
nadp_writer_xxx are renamed to fma_desktop_writer_xxx
src/io-desktop/Makefile.am | 4 +-
src/io-desktop/fma-desktop-provider.c | 22 +++---
.../{nadp-writer.c => fma-desktop-writer.c} | 46 ++++++------
src/io-desktop/fma-desktop-writer.h | 73 ++++++++++++++++++++
src/io-desktop/nadp-writer.h | 63 -----------------
5 files changed, 109 insertions(+), 99 deletions(-)
---
diff --git a/src/io-desktop/Makefile.am b/src/io-desktop/Makefile.am
index 461dcdf..c31a3c7 100644
--- a/src/io-desktop/Makefile.am
+++ b/src/io-desktop/Makefile.am
@@ -56,8 +56,8 @@ libna_io_desktop_la_SOURCES = \
fma-desktop-reader.h \
fma-desktop-utils.c \
fma-desktop-utils.h \
- nadp-writer.c \
- nadp-writer.h \
+ fma-desktop-writer.c \
+ fma-desktop-writer.h \
nadp-xdg-dirs.c \
nadp-xdg-dirs.h \
$(NULL)
diff --git a/src/io-desktop/fma-desktop-provider.c b/src/io-desktop/fma-desktop-provider.c
index bff5c35..3a87a86 100644
--- a/src/io-desktop/fma-desktop-provider.c
+++ b/src/io-desktop/fma-desktop-provider.c
@@ -42,7 +42,7 @@
#include "fma-desktop-keys.h"
#include "fma-desktop-monitor.h"
#include "fma-desktop-reader.h"
-#include "nadp-writer.h"
+#include "fma-desktop-writer.h"
/* private class data
*/
@@ -234,11 +234,11 @@ iio_provider_iface_init( FMAIIOProviderInterface *iface )
iface->get_id = iio_provider_get_id;
iface->get_name = iio_provider_get_name;
iface->read_items = fma_desktop_reader_iio_provider_read_items;
- iface->is_willing_to_write = nadp_iio_provider_is_willing_to_write;
- iface->is_able_to_write = nadp_iio_provider_is_able_to_write;
- iface->write_item = nadp_iio_provider_write_item;
- iface->delete_item = nadp_iio_provider_delete_item;
- iface->duplicate_data = nadp_iio_provider_duplicate_data;
+ iface->is_willing_to_write = fma_desktop_writer_iio_provider_is_willing_to_write;
+ iface->is_able_to_write = fma_desktop_writer_iio_provider_is_able_to_write;
+ iface->write_item = fma_desktop_writer_iio_provider_write_item;
+ iface->delete_item = fma_desktop_writer_iio_provider_delete_item;
+ iface->duplicate_data = fma_desktop_writer_iio_provider_duplicate_data;
}
static guint
@@ -270,9 +270,9 @@ ifactory_provider_iface_init( FMAIFactoryProviderInterface *iface )
iface->read_start = fma_desktop_reader_ifactory_provider_read_start;
iface->read_data = fma_desktop_reader_ifactory_provider_read_data;
iface->read_done = fma_desktop_reader_ifactory_provider_read_done;
- iface->write_start = nadp_writer_ifactory_provider_write_start;
- iface->write_data = nadp_writer_ifactory_provider_write_data;
- iface->write_done = nadp_writer_ifactory_provider_write_done;
+ iface->write_start = fma_desktop_writer_ifactory_provider_write_start;
+ iface->write_data = fma_desktop_writer_ifactory_provider_write_data;
+ iface->write_done = fma_desktop_writer_ifactory_provider_write_done;
}
static guint
@@ -309,8 +309,8 @@ iexporter_iface_init( FMAIExporterInterface *iface )
iface->get_name = iexporter_get_name;
iface->get_formats = iexporter_get_formats;
iface->free_formats = iexporter_free_formats;
- iface->to_file = nadp_writer_iexporter_export_to_file;
- iface->to_buffer = nadp_writer_iexporter_export_to_buffer;
+ iface->to_file = fma_desktop_writer_iexporter_export_to_file;
+ iface->to_buffer = fma_desktop_writer_iexporter_export_to_buffer;
}
static guint
diff --git a/src/io-desktop/nadp-writer.c b/src/io-desktop/fma-desktop-writer.c
similarity index 90%
rename from src/io-desktop/nadp-writer.c
rename to src/io-desktop/fma-desktop-writer.c
index eb4f3e7..a405dff 100644
--- a/src/io-desktop/nadp-writer.c
+++ b/src/io-desktop/fma-desktop-writer.c
@@ -44,7 +44,7 @@
#include "fma-desktop-formats.h"
#include "fma-desktop-keys.h"
#include "fma-desktop-utils.h"
-#include "nadp-writer.h"
+#include "fma-desktop-writer.h"
#include "nadp-xdg-dirs.h"
/* the association between an export format and the functions
@@ -80,7 +80,7 @@ static ExportFormatFn *find_export_format_fn_from_quark( GQuark format );
* This is implementation of FMAIIOProvider::is_willing_to_write method
*/
gboolean
-nadp_iio_provider_is_willing_to_write( const FMAIIOProvider *provider )
+fma_desktop_writer_iio_provider_is_willing_to_write( const FMAIIOProvider *provider )
{
return( TRUE );
}
@@ -92,9 +92,9 @@ nadp_iio_provider_is_willing_to_write( const FMAIIOProvider *provider )
* This is implementation of FMAIIOProvider::is_able_to_write method
*/
gboolean
-nadp_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
+fma_desktop_writer_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
{
- static const gchar *thisfn = "nadp_writer_iio_provider_is_able_to_write";
+ static const gchar *thisfn = "fma_desktop_writer_iio_provider_is_able_to_write";
gboolean able_to;
gchar *userdir;
@@ -124,9 +124,9 @@ nadp_iio_provider_is_able_to_write( const FMAIIOProvider *provider )
* This is implementation of FMAIIOProvider::write_item method
*/
guint
-nadp_iio_provider_write_item( const FMAIIOProvider *provider, const FMAObjectItem *item, GSList **messages )
+fma_desktop_writer_iio_provider_write_item( const FMAIIOProvider *provider, const FMAObjectItem *item,
GSList **messages )
{
- static const gchar *thisfn = "nadp_iio_provider_write_item";
+ static const gchar *thisfn = "fma_desktop_writer_iio_provider_write_item";
guint ret;
FMADesktopFile *ndf;
gchar *path;
@@ -207,7 +207,7 @@ nadp_iio_provider_write_item( const FMAIIOProvider *provider, const FMAObjectIte
static guint
write_item( const FMAIIOProvider *provider, const FMAObjectItem *item, FMADesktopFile *ndf, GSList
**messages )
{
- static const gchar *thisfn = "nadp_iio_provider_write_item";
+ static const gchar *thisfn = "fma_desktop_writer_iio_provider_write_item";
guint ret;
FMADesktopProvider *self;
@@ -247,9 +247,9 @@ write_item( const FMAIIOProvider *provider, const FMAObjectItem *item, FMADeskto
}
guint
-nadp_iio_provider_delete_item( const FMAIIOProvider *provider, const FMAObjectItem *item, GSList **messages )
+fma_desktop_writer_iio_provider_delete_item( const FMAIIOProvider *provider, const FMAObjectItem *item,
GSList **messages )
{
- static const gchar *thisfn = "nadp_iio_provider_delete_item";
+ static const gchar *thisfn = "fma_desktop_writer_iio_provider_delete_item";
guint ret;
FMADesktopProvider *self;
FMADesktopFile *ndf;
@@ -294,7 +294,7 @@ nadp_iio_provider_delete_item( const FMAIIOProvider *provider, const FMAObjectIt
static void
desktop_weak_notify( FMADesktopFile *ndf, GObject *item )
{
- static const gchar *thisfn = "nadp_writer_desktop_weak_notify";
+ static const gchar *thisfn = "fma_desktop_writer_desktop_weak_notify";
g_debug( "%s: ndf=%p (%s), item=%p (%s)",
thisfn, ( void * ) ndf, G_OBJECT_TYPE_NAME( ndf ),
@@ -309,9 +309,9 @@ desktop_weak_notify( FMADesktopFile *ndf, GObject *item )
* does not invalid duplicated pointer
*/
guint
-nadp_iio_provider_duplicate_data( const FMAIIOProvider *provider, FMAObjectItem *dest, const FMAObjectItem
*source, GSList **messages )
+fma_desktop_writer_iio_provider_duplicate_data( const FMAIIOProvider *provider, FMAObjectItem *dest, const
FMAObjectItem *source, GSList **messages )
{
- static const gchar *thisfn = "nadp_iio_provider_duplicate_data";
+ static const gchar *thisfn = "fma_desktop_writer_iio_provider_duplicate_data";
guint ret;
FMADesktopProvider *self;
FMADesktopFile *ndf;
@@ -345,16 +345,16 @@ nadp_iio_provider_duplicate_data( const FMAIIOProvider *provider, FMAObjectItem
}
/**
- * nadp_writer_iexporter_export_to_buffer:
+ * fma_desktop_writer_iexporter_export_to_buffer:
* @instance: this #FMAIExporter instance.
* @parms: a #FMAIExporterBufferParmsv2 structure.
*
* Export the specified 'item' to a newly allocated buffer.
*/
guint
-nadp_writer_iexporter_export_to_buffer( const FMAIExporter *instance, FMAIExporterBufferParmsv2 *parms )
+fma_desktop_writer_iexporter_export_to_buffer( const FMAIExporter *instance, FMAIExporterBufferParmsv2
*parms )
{
- static const gchar *thisfn = "nadp_writer_iexporter_export_to_buffer";
+ static const gchar *thisfn = "fma_desktop_writer_iexporter_export_to_buffer";
guint code, write_code;
ExportFormatFn *fmt;
GKeyFile *key_file;
@@ -405,16 +405,16 @@ nadp_writer_iexporter_export_to_buffer( const FMAIExporter *instance, FMAIExport
}
/**
- * nadp_writer_iexporter_export_to_file:
+ * fma_desktop_writer_iexporter_export_to_file:
* @instance: this #FMAIExporter instance.
* @parms: a #FMAIExporterFileParmsv2 structure.
*
* Export the specified 'item' to a newly created file.
*/
guint
-nadp_writer_iexporter_export_to_file( const FMAIExporter *instance, FMAIExporterFileParmsv2 *parms )
+fma_desktop_writer_iexporter_export_to_file( const FMAIExporter *instance, FMAIExporterFileParmsv2 *parms )
{
- static const gchar *thisfn = "nadp_writer_iexporter_export_to_file";
+ static const gchar *thisfn = "fma_desktop_writer_iexporter_export_to_file";
guint code, write_code;
gchar *id, *folder_path, *dest_path;
ExportFormatFn *fmt;
@@ -473,7 +473,7 @@ nadp_writer_iexporter_export_to_file( const FMAIExporter *instance, FMAIExporter
}
guint
-nadp_writer_ifactory_provider_write_start( const FMAIFactoryProvider *provider, void *writer_data,
+fma_desktop_writer_ifactory_provider_write_start( const FMAIFactoryProvider *provider, void *writer_data,
const FMAIFactoryObject *object, GSList **messages )
{
if( FMA_IS_OBJECT_ITEM( object )){
@@ -498,11 +498,11 @@ write_start_write_type( FMADesktopFile *ndp, FMAObjectItem *item )
* then concatenate these two fields to the 'Exec' key
*/
guint
-nadp_writer_ifactory_provider_write_data(
+fma_desktop_writer_ifactory_provider_write_data(
const FMAIFactoryProvider *provider, void *writer_data, const
FMAIFactoryObject *object,
const FMADataBoxed *boxed, GSList **messages )
{
- static const gchar *thisfn = "nadp_writer_ifactory_provider_write_data";
+ static const gchar *thisfn = "fma_desktop_writer_ifactory_provider_write_data";
FMADesktopFile *ndf;
guint code;
const FMADataDef *def;
@@ -589,7 +589,7 @@ nadp_writer_ifactory_provider_write_data(
}
guint
-nadp_writer_ifactory_provider_write_done( const FMAIFactoryProvider *provider, void *writer_data,
+fma_desktop_writer_ifactory_provider_write_done( const FMAIFactoryProvider *provider, void *writer_data,
const FMAIFactoryObject *object, GSList **messages )
{
if( FMA_IS_OBJECT_ITEM( object )){
@@ -602,7 +602,7 @@ nadp_writer_ifactory_provider_write_done( const FMAIFactoryProvider *provider, v
static void
write_done_write_subitems_list( FMADesktopFile *ndp, FMAObjectItem *item )
{
- static const gchar *thisfn = "nadp_writer_write_done_write_subitems_list";
+ static const gchar *thisfn = "fma_desktop_writer_write_done_write_subitems_list";
GSList *subitems;
GSList *profile_groups, *ip;
gchar *tmp;
diff --git a/src/io-desktop/fma-desktop-writer.h b/src/io-desktop/fma-desktop-writer.h
new file mode 100644
index 0000000..4f3e3b4
--- /dev/null
+++ b/src/io-desktop/fma-desktop-writer.h
@@ -0,0 +1,73 @@
+/*
+ * FileManager-Actions
+ * A file-manager extension which offers configurable context menu actions.
+ *
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006-2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009-2015 Pierre Wieser and others (see AUTHORS)
+ *
+ * FileManager-Actions 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.
+ *
+ * FileManager-Actions 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 FileManager-Actions; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Frederic Ruaudel <grumz grumz net>
+ * Rodrigo Moya <rodrigo gnome-db org>
+ * Pierre Wieser <pwieser trychlos org>
+ * ... and many others (see AUTHORS)
+ */
+
+#ifndef __IO_DESKTOP_FMA_DESKTOP_WRITER_H__
+#define __IO_DESKTOP_FMA_DESKTOP_WRITER_H__
+
+#include <api/fma-iio-provider.h>
+#include <api/fma-iexporter.h>
+#include <api/fma-ifactory-provider.h>
+
+G_BEGIN_DECLS
+
+gboolean fma_desktop_writer_iio_provider_is_willing_to_write( const FMAIIOProvider *provider );
+gboolean fma_desktop_writer_iio_provider_is_able_to_write ( const FMAIIOProvider *provider );
+
+guint fma_desktop_writer_iio_provider_write_item ( const FMAIIOProvider *provider,
+
const FMAObjectItem *item,
+
GSList **messages );
+guint fma_desktop_writer_iio_provider_delete_item ( const FMAIIOProvider *provider,
+
const FMAObjectItem *item,
+
GSList **messages );
+guint fma_desktop_writer_iio_provider_duplicate_data ( const FMAIIOProvider *provider,
+
FMAObjectItem *dest,
+
const FMAObjectItem *source,
+
GSList **messages );
+
+guint fma_desktop_writer_iexporter_export_to_buffer ( const FMAIExporter *instance,
+
FMAIExporterBufferParmsv2 *parms );
+guint fma_desktop_writer_iexporter_export_to_file ( const FMAIExporter *instance,
+
FMAIExporterFileParmsv2 *parms );
+
+guint fma_desktop_writer_ifactory_provider_write_start ( const FMAIFactoryProvider *provider,
+
void *writer_data,
+
const FMAIFactoryObject *object,
+
GSList **messages );
+guint fma_desktop_writer_ifactory_provider_write_data ( const FMAIFactoryProvider *provider,
+
void *writer_data,
+
const FMAIFactoryObject *object,
+
const FMADataBoxed *boxed, GSList **messages );
+guint fma_desktop_writer_ifactory_provider_write_done ( const FMAIFactoryProvider *provider,
+
void *writer_data,
+
const FMAIFactoryObject *object,
+
GSList **messages );
+
+G_END_DECLS
+
+#endif /* __IO_DESKTOP_FMA_DESKTOP_WRITER_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
