[nautilus-actions/file-manager-actions] NAGnomeVFS is renamed to FMAGnomeVFS
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] NAGnomeVFS is renamed to FMAGnomeVFS
- Date: Mon, 7 Sep 2015 22:10:28 +0000 (UTC)
commit dac24ac09b4b09c757253d0a0f38cbe7bf54b0ad
Author: Pierre Wieser <pwieser trychlos org>
Date: Mon Sep 7 23:45:13 2015 +0200
NAGnomeVFS is renamed to FMAGnomeVFS
src/core/Makefile.am | 4 ++--
.../{na-gnome-vfs-uri.c => fma-gnome-vfs-uri.c} | 10 +++++-----
.../{na-gnome-vfs-uri.h => fma-gnome-vfs-uri.h} | 12 ++++++------
src/core/fma-icontext.c | 2 +-
src/core/fma-object-profile.c | 2 +-
src/core/na-selected-info.c | 10 +++++-----
src/core/na-tokens.c | 10 +++++-----
src/nact/nact-tree-model-dnd.c | 2 +-
src/test/test-parse-uris.c | 6 +++---
9 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 2ca0db0..c820f1b 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -72,8 +72,8 @@ libna_core_la_SOURCES = \
fma-gconf-migration.h \
fma-gconf-monitor.c \
fma-gconf-utils.c \
- na-gnome-vfs-uri.c \
- na-gnome-vfs-uri.h \
+ fma-gnome-vfs-uri.c \
+ fma-gnome-vfs-uri.h \
na-gtk-utils.c \
na-gtk-utils.h \
fma-icontext.c \
diff --git a/src/core/na-gnome-vfs-uri.c b/src/core/fma-gnome-vfs-uri.c
similarity index 98%
rename from src/core/na-gnome-vfs-uri.c
rename to src/core/fma-gnome-vfs-uri.c
index b1b9c10..8bede1e 100644
--- a/src/core/na-gnome-vfs-uri.c
+++ b/src/core/fma-gnome-vfs-uri.c
@@ -59,7 +59,7 @@
#include <string.h>
-#include "na-gnome-vfs-uri.h"
+#include "fma-gnome-vfs-uri.h"
#define HEX_ESCAPE '%'
@@ -72,14 +72,14 @@ static char *gnome_vfs_escape_set(const char *string, const char *match_s
static void gnome_vfs_remove_optional_escapes (char *uri);
static char * gnome_vfs_unescape_string (const gchar *escaped_string, const gchar *illegal_characters);
static int hex_to_int (gchar c);
-static void set_uri_element (NAGnomeVFSURI *vfs, const gchar *text, guint len);
+static void set_uri_element (FMAGnomeVFSURI *vfs, const gchar *text, guint len);
static gchar *split_toplevel_uri (const gchar *path, guint path_len,
gchar
**host_return, gchar **user_return,
guint
*port_return, gchar **password_return);
static int unescape_character (const char *scanner);
void
-na_gnome_vfs_uri_parse( NAGnomeVFSURI *vfs, const gchar *text_uri )
+fma_gnome_vfs_uri_parse( FMAGnomeVFSURI *vfs, const gchar *text_uri )
{
const gchar *method_scanner;
gchar *extension_scanner;
@@ -117,7 +117,7 @@ na_gnome_vfs_uri_parse( NAGnomeVFSURI *vfs, const gchar *text_uri )
}
void
-na_gnome_vfs_uri_free( NAGnomeVFSURI *vfs )
+fma_gnome_vfs_uri_free( FMAGnomeVFSURI *vfs )
{
g_free( vfs->path );
g_free( vfs->scheme );
@@ -570,7 +570,7 @@ gnome_vfs_unescape_string (const gchar *escaped_string,
}
static void
-set_uri_element (NAGnomeVFSURI *vfs,
+set_uri_element (FMAGnomeVFSURI *vfs,
const gchar *text,
guint len)
{
diff --git a/src/core/na-gnome-vfs-uri.h b/src/core/fma-gnome-vfs-uri.h
similarity index 90%
rename from src/core/na-gnome-vfs-uri.h
rename to src/core/fma-gnome-vfs-uri.h
index 2986dab..f8a040e 100644
--- a/src/core/na-gnome-vfs-uri.h
+++ b/src/core/fma-gnome-vfs-uri.h
@@ -27,8 +27,8 @@
* ... and many others (see AUTHORS)
*/
-#ifndef __NAUTILUS_ACTIONS_NA_PRIVATE_GNOME_VFS_URI_H__
-#define __NAUTILUS_ACTIONS_NA_PRIVATE_GNOME_VFS_URI_H__
+#ifndef __CORE_FMA_GNOME_VFS_URI_H__
+#define __CORE_FMA_GNOME_VFS_URI_H__
/*
* pwi 2009-07-29
@@ -68,7 +68,7 @@ typedef struct {
gchar *user_name;
gchar *password;
}
- NAGnomeVFSURI;
+ FMAGnomeVFSURI;
/*
* GNOME_VFS_URI_MAGIC_CHR:
@@ -98,10 +98,10 @@ typedef struct {
#define GNOME_VFS_URI_PATH_CHR '/'
#define GNOME_VFS_URI_PATH_STR "/"
-void na_gnome_vfs_uri_parse( NAGnomeVFSURI *vfs, const gchar *uri );
+void fma_gnome_vfs_uri_parse( FMAGnomeVFSURI *vfs, const gchar *uri );
-void na_gnome_vfs_uri_free( NAGnomeVFSURI *vfs );
+void fma_gnome_vfs_uri_free( FMAGnomeVFSURI *vfs );
G_END_DECLS
-#endif /* __NAUTILUS_ACTIONS_NA_PRIVATE_GNOME_VFS_URI_H__ */
+#endif /* __CORE_FMA_GNOME_VFS_URI_H__ */
diff --git a/src/core/fma-icontext.c b/src/core/fma-icontext.c
index 7687298..b41f908 100644
--- a/src/core/fma-icontext.c
+++ b/src/core/fma-icontext.c
@@ -51,7 +51,7 @@
#include <api/fma-object-api.h>
#include "fma-desktop-environment.h"
-#include "na-gnome-vfs-uri.h"
+#include "fma-gnome-vfs-uri.h"
#include "na-selected-info.h"
#include "na-settings.h"
diff --git a/src/core/fma-object-profile.c b/src/core/fma-object-profile.c
index 4037289..2e428c4 100644
--- a/src/core/fma-object-profile.c
+++ b/src/core/fma-object-profile.c
@@ -44,7 +44,7 @@
#include "fma-factory-provider.h"
#include "fma-factory-object.h"
#include "na-selected-info.h"
-#include "na-gnome-vfs-uri.h"
+#include "fma-gnome-vfs-uri.h"
/* private class data
*/
diff --git a/src/core/na-selected-info.c b/src/core/na-selected-info.c
index a3eda02..848331e 100644
--- a/src/core/na-selected-info.c
+++ b/src/core/na-selected-info.c
@@ -34,7 +34,7 @@
#include <glib/gi18n.h>
#include <string.h>
-#include "na-gnome-vfs-uri.h"
+#include "fma-gnome-vfs-uri.h"
#include "na-selected-info.h"
/* private class data
@@ -807,7 +807,7 @@ static NASelectedInfo *
new_from_uri( const gchar *uri, const gchar *mimetype, gchar **errmsg )
{
GFile *location;
- NAGnomeVFSURI *vfs;
+ FMAGnomeVFSURI *vfs;
NASelectedInfo *info = g_object_new( NA_TYPE_SELECTED_INFO, NULL );
@@ -825,8 +825,8 @@ new_from_uri( const gchar *uri, const gchar *mimetype, gchar **errmsg )
location = g_file_new_for_uri( uri );
info->private->filename = g_file_get_path( location );
- vfs = g_new0( NAGnomeVFSURI, 1 );
- na_gnome_vfs_uri_parse( vfs, uri );
+ vfs = g_new0( FMAGnomeVFSURI, 1 );
+ fma_gnome_vfs_uri_parse( vfs, uri );
if( !info->private->filename ){
g_debug( "na_selected_info_new_from_uri: uri='%s', filename=NULL, setting it to '%s'", uri,
vfs->path );
info->private->filename = g_strdup( vfs->path );
@@ -838,7 +838,7 @@ new_from_uri( const gchar *uri, const gchar *mimetype, gchar **errmsg )
info->private->username = g_strdup( vfs->user_name );
info->private->scheme = g_strdup( vfs->scheme );
info->private->port = vfs->host_port;
- na_gnome_vfs_uri_free( vfs );
+ fma_gnome_vfs_uri_free( vfs );
query_file_attributes( info, location, errmsg );
g_object_unref( location );
diff --git a/src/core/na-tokens.c b/src/core/na-tokens.c
index c7fd56f..014c8e7 100644
--- a/src/core/na-tokens.c
+++ b/src/core/na-tokens.c
@@ -39,7 +39,7 @@
#include <api/fma-core-utils.h>
#include <api/fma-object-api.h>
-#include "na-gnome-vfs-uri.h"
+#include "fma-gnome-vfs-uri.h"
#include "na-selected-info.h"
#include "na-settings.h"
#include "na-tokens.h"
@@ -255,7 +255,7 @@ na_tokens_new_for_example( void )
const guint ex_port = 8080;
const gchar *ex_host = _( "test.example.net" );
const gchar *ex_user = _( "user" );
- NAGnomeVFSURI *vfs;
+ FMAGnomeVFSURI *vfs;
gchar *dirname, *bname, *bname_woext, *ext;
GSList *is;
gboolean first;
@@ -270,8 +270,8 @@ na_tokens_new_for_example( void )
tokens->private->uris = g_slist_append( tokens->private->uris, g_strdup( ex_uri2 ));
for( is = tokens->private->uris ; is ; is = is->next ){
- vfs = g_new0( NAGnomeVFSURI, 1 );
- na_gnome_vfs_uri_parse( vfs, is->data );
+ vfs = g_new0( FMAGnomeVFSURI, 1 );
+ fma_gnome_vfs_uri_parse( vfs, is->data );
tokens->private->filenames = g_slist_append( tokens->private->filenames, g_strdup( vfs->path
));
dirname = g_path_get_dirname( vfs->path );
@@ -287,7 +287,7 @@ na_tokens_new_for_example( void )
first = FALSE;
}
- na_gnome_vfs_uri_free( vfs );
+ fma_gnome_vfs_uri_free( vfs );
}
tokens->private->mimetypes = g_slist_append( tokens->private->mimetypes, g_strdup( ex_mimetype1 ));
diff --git a/src/nact/nact-tree-model-dnd.c b/src/nact/nact-tree-model-dnd.c
index a6f4f46..88fd544 100644
--- a/src/nact/nact-tree-model-dnd.c
+++ b/src/nact/nact-tree-model-dnd.c
@@ -38,7 +38,7 @@
#include <api/fma-core-utils.h>
#include <api/fma-object-api.h>
-#include <core/na-gnome-vfs-uri.h>
+#include <core/fma-gnome-vfs-uri.h>
#include <core/na-importer.h>
#include "nact-application.h"
diff --git a/src/test/test-parse-uris.c b/src/test/test-parse-uris.c
index b88a88d..5cc3568 100644
--- a/src/test/test-parse-uris.c
+++ b/src/test/test-parse-uris.c
@@ -35,7 +35,7 @@
#include <glib/gprintf.h>
#include <stdlib.h>
-#include <core/na-gnome-vfs-uri.h>
+#include <core/fma-gnome-vfs-uri.h>
static const gchar *uris[] = {
"http://robert:azerty01 mon domain com/path/to/a/document?query#anchor",
@@ -58,8 +58,8 @@ main( int argc, char** argv )
g_printf( "URIs parsing test.\n\n" );
for( i = 0 ; uris[i] ; ++i ){
- NAGnomeVFSURI *vfs = g_new0( NAGnomeVFSURI, 1 );
- na_gnome_vfs_uri_parse( vfs, uris[i] );
+ FMAGnomeVFSURI *vfs = g_new0( FMAGnomeVFSURI, 1 );
+ fma_gnome_vfs_uri_parse( vfs, uris[i] );
g_printf( "original uri=%s\n", uris[i] );
g_printf( "vfs path=%s\n", vfs->path );
g_printf( "vfs scheme=%s\n", vfs->scheme );
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
