[file-roller/wip/jtojnar/gir-cleanups: 5/7] gir: Add Fr prefix to public symbols without namespace
- From: Jan Tojnar <jtojnar src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [file-roller/wip/jtojnar/gir-cleanups: 5/7] gir: Add Fr prefix to public symbols without namespace
- Date: Thu, 18 Aug 2022 00:31:14 +0000 (UTC)
commit d525de5fab9f160dee3bf79a80efdd17ac28f768
Author: Jan Tojnar <jtojnar gmail com>
Date: Thu Aug 18 01:31:14 2022 +0200
gir: Add Fr prefix to public symbols without namespace
To fix “Unknown namespace for symbol” warnings when compiling the GIR.
data/update-packages-match | 2 +-
src/dlg-package-installer.c | 6 +++---
src/fr-application-menu.c | 6 +++---
src/fr-application-menu.h | 4 ++--
src/fr-application.c | 10 +++++-----
src/fr-archive.c | 10 +++++-----
src/fr-command-7z.c | 6 +++---
src/fr-command-ace.c | 2 +-
src/fr-command-alz.c | 2 +-
src/fr-command-ar.c | 2 +-
src/fr-command-arj.c | 2 +-
src/fr-command-cfile.c | 22 +++++++++++-----------
src/fr-command-cpio.c | 2 +-
src/fr-command-dpkg.c | 2 +-
src/fr-command-iso.c | 2 +-
src/fr-command-jar.c | 2 +-
src/fr-command-lha.c | 2 +-
src/fr-command-lrzip.c | 2 +-
src/fr-command-rar.c | 2 +-
src/fr-command-rpm.c | 2 +-
src/fr-command-tar.c | 28 ++++++++++++++--------------
src/fr-command-unarchiver.c | 2 +-
src/fr-command-unsquashfs.c | 2 +-
src/fr-command-unstuff.c | 2 +-
src/fr-command-zip.c | 2 +-
src/fr-command-zoo.c | 2 +-
src/fr-command.h | 2 +-
src/fr-init.c | 22 +++++++++++-----------
src/fr-init.h | 18 +++++++++---------
src/fr-new-archive-dialog.c | 2 +-
src/fr-process.c | 16 ++++++++--------
src/fr-process.h | 18 +++++++++---------
src/fr-window-actions-callbacks.c | 2 +-
src/fr-window-actions-callbacks.h | 2 +-
src/fr-window-actions-entries.h | 4 ++--
src/fr-window.c | 6 +++---
36 files changed, 110 insertions(+), 110 deletions(-)
---
diff --git a/data/update-packages-match b/data/update-packages-match
index 4a1a8e34..f6048d42 100644
--- a/data/update-packages-match
+++ b/data/update-packages-match
@@ -1,2 +1,2 @@
-list=`find .. -iname "*.c" | xargs grep PACKAGES | sed -e 's/.*PACKAGES[ ]*[(]"\([^"]*\)"[)];/\1/g' -e
's/,/\n/g' | sort -u | sed -e 's/\(.*\)/\1=/g' | tr '\n' '|'`
+list=`find .. -iname "*.c" | xargs grep FR_PACKAGES | sed -e 's/.*FR_PACKAGES[ ]*[(]"\([^"]*\)"[)];/\1/g' -e
's/,/\n/g' | sort -u | sed -e 's/\(.*\)/\1=/g' | tr '\n' '|'`
sed -e 's/@NAMES@/'"$list"'/g' < packages.match.in | tr '|' '\n' > packages.match
diff --git a/src/dlg-package-installer.c b/src/dlg-package-installer.c
index 9ca6a9f0..f0a34bdb 100644
--- a/src/dlg-package-installer.c
+++ b/src/dlg-package-installer.c
@@ -68,7 +68,7 @@ package_installer_terminated (InstallerData *idata,
error_message);
}
else {
- update_registered_archives_capabilities ();
+ fr_update_registered_archives_capabilities ();
if (fr_window_is_batch_mode (idata->window))
fr_window_batch_resume (idata->window);
else
@@ -285,9 +285,9 @@ file_buffer_ready_cb (GObject *source_object,
g_free (uri);
g_free (buffer);
- archive_type = get_preferred_archive_for_mime_type (mime_type, FR_ARCHIVE_CAN_READ_WRITE);
+ archive_type = fr_get_preferred_archive_for_mime_type (mime_type, FR_ARCHIVE_CAN_READ_WRITE);
if (archive_type == 0)
- archive_type = get_preferred_archive_for_mime_type (mime_type, FR_ARCHIVE_CAN_READ);
+ archive_type = fr_get_preferred_archive_for_mime_type (mime_type, FR_ARCHIVE_CAN_READ);
if (archive_type == 0) {
package_installer_terminated (idata, FR_ERROR_GENERIC, _("Archive type not supported."));
return;
diff --git a/src/fr-application-menu.c b/src/fr-application-menu.c
index d7a61593..f9b58ac3 100644
--- a/src/fr-application-menu.c
+++ b/src/fr-application-menu.c
@@ -160,7 +160,7 @@ static const GActionEntry app_menu_entries[] = {
},
{
.name = PREF_UI_VIEW_SIDEBAR,
- .activate = toggle_action_activated,
+ .activate = fr_toggle_action_activated,
.state = "true",
.change_state = fr_application_activate_view_sidebar },
{
@@ -222,7 +222,7 @@ pref_list_mode_changed (GSettings *settings,
void
-initialize_app_menu (GApplication *application)
+fr_initialize_app_menu (GApplication *application)
{
GSettings *settings;
@@ -253,7 +253,7 @@ initialize_app_menu (GApplication *application)
void
-initialize_app_menubar (GApplication *application)
+fr_initialize_app_menubar (GApplication *application)
{
GtkBuilder *builder;
GSettings *settings;
diff --git a/src/fr-application-menu.h b/src/fr-application-menu.h
index 7edd8b5a..e7b61718 100644
--- a/src/fr-application-menu.h
+++ b/src/fr-application-menu.h
@@ -26,7 +26,7 @@
#include <glib.h>
#include <gio/gio.h>
-void initialize_app_menu (GApplication *application);
-void initialize_app_menubar (GApplication *application);
+void fr_initialize_app_menu (GApplication *application);
+void fr_initialize_app_menubar (GApplication *application);
#endif /* APP_MENU_H */
diff --git a/src/fr-application.c b/src/fr-application.c
index f151fedc..a0097b9c 100644
--- a/src/fr-application.c
+++ b/src/fr-application.c
@@ -177,7 +177,7 @@ handle_method_call (GDBusConnection *connection,
GDBusMethodInvocation *invocation,
gpointer user_data)
{
- update_registered_archives_capabilities ();
+ fr_update_registered_archives_capabilities ();
if (g_strcmp0 (method_name, "GetSupportedTypes") == 0) {
char *action;
@@ -388,7 +388,7 @@ fr_application_finalize (GObject *object)
_g_object_unref (self->listing_settings);
_g_object_unref (self->ui_settings);
- release_data ();
+ fr_release_data ();
G_OBJECT_CLASS (fr_application_parent_class)->finalize (object);
}
@@ -478,7 +478,7 @@ fr_application_startup (GApplication *application)
gtk_window_set_default_icon_name ("org.gnome.ArchiveManager");
fr_application_register_archive_manager_service (FR_APPLICATION (application));
- initialize_data ();
+ fr_initialize_data ();
/* use the menubar only when the shell shows the menu bar */
@@ -492,9 +492,9 @@ fr_application_startup (GApplication *application)
HDY_COLOR_SCHEME_PREFER_LIGHT);
if (shell_shows_menubar)
- initialize_app_menubar (application);
+ fr_initialize_app_menubar (application);
else
- initialize_app_menu (application);
+ fr_initialize_app_menu (application);
/* Setup actions */
g_action_map_add_action_entries (G_ACTION_MAP (application), entries,
diff --git a/src/fr-archive.c b/src/fr-archive.c
index bfb4a129..79b7758c 100644
--- a/src/fr-archive.c
+++ b/src/fr-archive.c
@@ -594,13 +594,13 @@ fr_archive_create (GFile *file,
* that can only create a specific file format. */
requested_capabilities = FR_ARCHIVE_CAN_READ_WRITE;
- archive_type = get_archive_type_from_mime_type (mime_type, requested_capabilities);
+ archive_type = fr_get_archive_type_from_mime_type (mime_type, requested_capabilities);
/* if no command was found, remove the read capability and try again */
if (archive_type == 0) {
requested_capabilities ^= FR_ARCHIVE_CAN_READ;
- archive_type = get_archive_type_from_mime_type (mime_type, requested_capabilities);
+ archive_type = fr_get_archive_type_from_mime_type (mime_type, requested_capabilities);
}
archive = create_archive_for_mime_type (archive_type,
@@ -679,13 +679,13 @@ create_archive_to_load_archive (GFile *file,
* that can only read a specific file format. */
requested_capabilities = FR_ARCHIVE_CAN_READ_WRITE;
- archive_type = get_archive_type_from_mime_type (mime_type, requested_capabilities);
+ archive_type = fr_get_archive_type_from_mime_type (mime_type, requested_capabilities);
/* if no command was found, remove the write capability and try again */
if (archive_type == 0) {
requested_capabilities ^= FR_ARCHIVE_CAN_WRITE;
- archive_type = get_archive_type_from_mime_type (mime_type, requested_capabilities);
+ archive_type = fr_get_archive_type_from_mime_type (mime_type, requested_capabilities);
}
return create_archive_for_mime_type (archive_type,
@@ -1362,7 +1362,7 @@ get_desired_destination_for_archive (GFile *file)
directory_uri = g_file_get_uri (directory);
name = g_file_get_basename (file);
- ext = get_archive_filename_extension (name);
+ ext = fr_get_archive_filename_extension (name);
if (ext == NULL)
/* if no extension is present add a suffix to the name... */
new_name = g_strconcat (name, "_FILES", NULL);
diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
index b9fdfbbf..20dcbb72 100644
--- a/src/fr-command-7z.c
+++ b/src/fr-command-7z.c
@@ -736,11 +736,11 @@ fr_command_7z_get_packages (FrArchive *archive,
const char *mime_type)
{
if (_g_mime_type_matches (mime_type, "application/x-rar"))
- return PACKAGES ("7zip,7zip-rar");
+ return FR_PACKAGES ("7zip,7zip-rar");
else if (_g_mime_type_matches (mime_type, "application/zip") || _g_mime_type_matches (mime_type,
"application/vnd.ms-cab-compressed"))
- return PACKAGES ("7zip,7zip-full");
+ return FR_PACKAGES ("7zip,7zip-full");
else
- return PACKAGES ("7zip");
+ return FR_PACKAGES ("7zip");
}
diff --git a/src/fr-command-ace.c b/src/fr-command-ace.c
index 58709962..ad9031b2 100644
--- a/src/fr-command-ace.c
+++ b/src/fr-command-ace.c
@@ -270,7 +270,7 @@ static const char *
fr_command_ace_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("unace");
+ return FR_PACKAGES ("unace");
}
diff --git a/src/fr-command-alz.c b/src/fr-command-alz.c
index 9c559f0e..09392837 100644
--- a/src/fr-command-alz.c
+++ b/src/fr-command-alz.c
@@ -332,7 +332,7 @@ static const char *
fr_command_alz_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("unalz");
+ return FR_PACKAGES ("unalz");
}
diff --git a/src/fr-command-ar.c b/src/fr-command-ar.c
index 2561f3f0..c661ba27 100644
--- a/src/fr-command-ar.c
+++ b/src/fr-command-ar.c
@@ -317,7 +317,7 @@ static const char *
fr_command_ar_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("binutils");
+ return FR_PACKAGES ("binutils");
}
diff --git a/src/fr-command-arj.c b/src/fr-command-arj.c
index 6d6f5780..d6b6f9b4 100644
--- a/src/fr-command-arj.c
+++ b/src/fr-command-arj.c
@@ -350,7 +350,7 @@ static const char *
fr_command_arj_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("arj");
+ return FR_PACKAGES ("arj");
}
diff --git a/src/fr-command-cfile.c b/src/fr-command-cfile.c
index 50884953..b112afb7 100644
--- a/src/fr-command-cfile.c
+++ b/src/fr-command-cfile.c
@@ -612,27 +612,27 @@ fr_command_cfile_get_packages (FrArchive *archive,
const char *mime_type)
{
if (_g_mime_type_matches (mime_type, "application/x-gzip"))
- return PACKAGES ("gzip");
+ return FR_PACKAGES ("gzip");
else if (_g_mime_type_matches (mime_type, "application/x-brotli"))
- return PACKAGES ("brotli");
+ return FR_PACKAGES ("brotli");
else if (_g_mime_type_matches (mime_type, "application/x-bzip"))
- return PACKAGES ("bzip2");
+ return FR_PACKAGES ("bzip2");
else if (_g_mime_type_matches (mime_type, "application/x-compress"))
- return PACKAGES ("ncompress");
+ return FR_PACKAGES ("ncompress");
else if (_g_mime_type_matches (mime_type, "application/x-lzip"))
- return PACKAGES ("lzip");
+ return FR_PACKAGES ("lzip");
else if (_g_mime_type_matches (mime_type, "application/x-lzma"))
- return PACKAGES ("lzma");
+ return FR_PACKAGES ("lzma");
else if (_g_mime_type_matches (mime_type, "application/x-xz"))
- return PACKAGES ("xz");
+ return FR_PACKAGES ("xz");
else if (_g_mime_type_matches (mime_type, "application/x-lzop"))
- return PACKAGES ("lzop");
+ return FR_PACKAGES ("lzop");
else if (_g_mime_type_matches (mime_type, "application/x-rzip"))
- return PACKAGES ("rzip");
+ return FR_PACKAGES ("rzip");
else if (_g_mime_type_matches (mime_type, "application/x-lz4"))
- return PACKAGES ("lz4");
+ return FR_PACKAGES ("lz4");
else if (_g_mime_type_matches (mime_type, "application/zstd"))
- return PACKAGES ("zstd");
+ return FR_PACKAGES ("zstd");
return NULL;
}
diff --git a/src/fr-command-cpio.c b/src/fr-command-cpio.c
index e3bc4d4e..f78f23d1 100644
--- a/src/fr-command-cpio.c
+++ b/src/fr-command-cpio.c
@@ -251,7 +251,7 @@ static const char *
fr_command_cpio_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("cpio");
+ return FR_PACKAGES ("cpio");
}
diff --git a/src/fr-command-dpkg.c b/src/fr-command-dpkg.c
index d8e02cb9..22667e1c 100644
--- a/src/fr-command-dpkg.c
+++ b/src/fr-command-dpkg.c
@@ -238,7 +238,7 @@ static const char *
fr_command_dpkg_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("dpkg");
+ return FR_PACKAGES ("dpkg");
}
diff --git a/src/fr-command-iso.c b/src/fr-command-iso.c
index 8839376f..34e083bd 100644
--- a/src/fr-command-iso.c
+++ b/src/fr-command-iso.c
@@ -231,7 +231,7 @@ static const char *
fr_command_iso_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("genisoimage");
+ return FR_PACKAGES ("genisoimage");
}
diff --git a/src/fr-command-jar.c b/src/fr-command-jar.c
index 490fb1dd..08854e13 100644
--- a/src/fr-command-jar.c
+++ b/src/fr-command-jar.c
@@ -181,7 +181,7 @@ static const char *
fr_command_jar_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("zip,unzip");
+ return FR_PACKAGES ("zip,unzip");
}
diff --git a/src/fr-command-lha.c b/src/fr-command-lha.c
index ba08e5bd..dd076949 100644
--- a/src/fr-command-lha.c
+++ b/src/fr-command-lha.c
@@ -330,7 +330,7 @@ static const char *
fr_command_lha_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("lha");
+ return FR_PACKAGES ("lha");
}
diff --git a/src/fr-command-lrzip.c b/src/fr-command-lrzip.c
index c52e9d9a..61161255 100644
--- a/src/fr-command-lrzip.c
+++ b/src/fr-command-lrzip.c
@@ -196,7 +196,7 @@ static const char *
fr_command_lrzip_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("lrzip");
+ return FR_PACKAGES ("lrzip");
}
diff --git a/src/fr-command-rar.c b/src/fr-command-rar.c
index d5e16b5f..0b3410e5 100644
--- a/src/fr-command-rar.c
+++ b/src/fr-command-rar.c
@@ -792,7 +792,7 @@ static const char *
fr_command_rar_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("rar,unrar");
+ return FR_PACKAGES ("rar,unrar");
}
diff --git a/src/fr-command-rpm.c b/src/fr-command-rpm.c
index 0c130ded..7ba48d38 100644
--- a/src/fr-command-rpm.c
+++ b/src/fr-command-rpm.c
@@ -252,7 +252,7 @@ static const char *
fr_command_rpm_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("cpio,rpm");
+ return FR_PACKAGES ("cpio,rpm");
}
diff --git a/src/fr-command-tar.c b/src/fr-command-tar.c
index 0b53735d..c4c1c135 100644
--- a/src/fr-command-tar.c
+++ b/src/fr-command-tar.c
@@ -1289,33 +1289,33 @@ fr_command_tar_get_packages (FrArchive *archive,
const char *mime_type)
{
if (_g_mime_type_matches (mime_type, "application/x-tar"))
- return PACKAGES ("tar");
+ return FR_PACKAGES ("tar");
else if (_g_mime_type_matches (mime_type, "application/x-compressed-tar"))
- return PACKAGES ("tar,gzip");
+ return FR_PACKAGES ("tar,gzip");
else if (_g_mime_type_matches (mime_type, "application/x-brotli-compressed-tar"))
- return PACKAGES ("tar,brotli");
+ return FR_PACKAGES ("tar,brotli");
else if (_g_mime_type_matches (mime_type, "application/x-bzip-compressed-tar"))
- return PACKAGES ("tar,bzip2");
+ return FR_PACKAGES ("tar,bzip2");
else if (_g_mime_type_matches (mime_type, "application/x-tarz"))
- return PACKAGES ("tar,gzip,ncompress");
+ return FR_PACKAGES ("tar,gzip,ncompress");
else if (_g_mime_type_matches (mime_type, "application/x-lrzip-compressed-tar"))
- return PACKAGES ("tar,lrzip");
+ return FR_PACKAGES ("tar,lrzip");
else if (_g_mime_type_matches (mime_type, "application/x-lz4-compressed-tar"))
- return PACKAGES ("tar,lz4");
+ return FR_PACKAGES ("tar,lz4");
else if (_g_mime_type_matches (mime_type, "application/x-lzip-compressed-tar"))
- return PACKAGES ("tar,lzip");
+ return FR_PACKAGES ("tar,lzip");
else if (_g_mime_type_matches (mime_type, "application/x-lzma-compressed-tar"))
- return PACKAGES ("tar,lzma");
+ return FR_PACKAGES ("tar,lzma");
else if (_g_mime_type_matches (mime_type, "application/x-xz-compressed-tar"))
- return PACKAGES ("tar,xz");
+ return FR_PACKAGES ("tar,xz");
else if (_g_mime_type_matches (mime_type, "application/x-tzo"))
- return PACKAGES ("tar,lzop");
+ return FR_PACKAGES ("tar,lzop");
else if (_g_mime_type_matches (mime_type, "application/x-7z-compressed-tar"))
- return PACKAGES ("tar,7zip");
+ return FR_PACKAGES ("tar,7zip");
else if (_g_mime_type_matches (mime_type, "application/x-rzip-compressed-tar"))
- return PACKAGES ("tar,rzip");
+ return FR_PACKAGES ("tar,rzip");
else if (_g_mime_type_matches (mime_type, "application/x-zstd-compressed-tar"))
- return PACKAGES ("tar,zstd");
+ return FR_PACKAGES ("tar,zstd");
return NULL;
}
diff --git a/src/fr-command-unarchiver.c b/src/fr-command-unarchiver.c
index 9684c63c..b08d30fa 100644
--- a/src/fr-command-unarchiver.c
+++ b/src/fr-command-unarchiver.c
@@ -284,7 +284,7 @@ static const char *
fr_command_unarchiver_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("unarchiver");
+ return FR_PACKAGES ("unarchiver");
}
diff --git a/src/fr-command-unsquashfs.c b/src/fr-command-unsquashfs.c
index 9d23dafa..8e203b67 100644
--- a/src/fr-command-unsquashfs.c
+++ b/src/fr-command-unsquashfs.c
@@ -198,7 +198,7 @@ static const char *
fr_command_unsquashfs_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("unsquashfs");
+ return FR_PACKAGES ("unsquashfs");
}
diff --git a/src/fr-command-unstuff.c b/src/fr-command-unstuff.c
index 24da605b..1c760d3d 100644
--- a/src/fr-command-unstuff.c
+++ b/src/fr-command-unstuff.c
@@ -310,7 +310,7 @@ static const char *
fr_command_unstuff_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("unstaff");
+ return FR_PACKAGES ("unstaff");
}
diff --git a/src/fr-command-zip.c b/src/fr-command-zip.c
index 79a4384c..0e67e6d1 100644
--- a/src/fr-command-zip.c
+++ b/src/fr-command-zip.c
@@ -431,7 +431,7 @@ static const char *
fr_command_zip_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("zip,unzip");
+ return FR_PACKAGES ("zip,unzip");
}
diff --git a/src/fr-command-zoo.c b/src/fr-command-zoo.c
index 6cb754ab..8af3edf0 100644
--- a/src/fr-command-zoo.c
+++ b/src/fr-command-zoo.c
@@ -349,7 +349,7 @@ static const char *
fr_command_zoo_get_packages (FrArchive *archive,
const char *mime_type)
{
- return PACKAGES ("zoo");
+ return FR_PACKAGES ("zoo");
}
diff --git a/src/fr-command.h b/src/fr-command.h
index 08275f53..0e6403c2 100644
--- a/src/fr-command.h
+++ b/src/fr-command.h
@@ -26,7 +26,7 @@
#include "fr-archive.h"
#include "fr-process.h"
-#define PACKAGES(x) (x)
+#define FR_PACKAGES(x) (x)
#define FR_TYPE_COMMAND (fr_command_get_type ())
#define FR_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FR_TYPE_COMMAND, FrCommand))
diff --git a/src/fr-init.c b/src/fr-init.c
index 37d94fcc..dd3c3e99 100644
--- a/src/fr-init.c
+++ b/src/fr-init.c
@@ -370,7 +370,7 @@ register_archives (void)
GType
-get_archive_type_from_mime_type (const char *mime_type,
+fr_get_archive_type_from_mime_type (const char *mime_type,
FrArchiveCaps requested_capabilities)
{
if (mime_type == NULL)
@@ -393,7 +393,7 @@ get_archive_type_from_mime_type (const char *mime_type,
GType
-get_preferred_archive_for_mime_type (const char *mime_type,
+fr_get_preferred_archive_for_mime_type (const char *mime_type,
FrArchiveCaps requested_capabilities)
{
for (guint i = 0; i < Registered_Archives->len; i++) {
@@ -413,7 +413,7 @@ get_preferred_archive_for_mime_type (const char *mime_type,
void
-update_registered_archives_capabilities (void)
+fr_update_registered_archives_capabilities (void)
{
g_hash_table_remove_all (ProgramsCache);
@@ -473,7 +473,7 @@ _g_mime_type_get_from_filename (GFile *file)
const char *
-get_archive_filename_extension (const char *filename)
+fr_get_archive_filename_extension (const char *filename)
{
const char *ext;
int i;
@@ -497,7 +497,7 @@ get_archive_filename_extension (const char *filename)
int
-get_mime_type_index (const char *mime_type)
+fr_get_mime_type_index (const char *mime_type)
{
int i;
@@ -548,7 +548,7 @@ sort_mime_types (int *a,
void
-sort_mime_types_by_extension (int *a)
+fr_sort_mime_types_by_extension (int *a)
{
sort_mime_types (a, cmp_mime_type_by_extension);
}
@@ -568,7 +568,7 @@ compute_supported_archive_types (void)
int idx;
cap = g_ptr_array_index (reg_com->caps, j);
- idx = get_mime_type_index (cap->mime_type);
+ idx = fr_get_mime_type_index (cap->mime_type);
if (idx < 0) {
g_warning ("mime type not recognized: %s", cap->mime_type);
continue;
@@ -598,7 +598,7 @@ static gboolean initialized = FALSE;
void
-initialize_data (void)
+fr_initialize_data (void)
{
if (initialized)
return;
@@ -618,7 +618,7 @@ initialize_data (void)
static void
-command_done (CommandData *cdata)
+command_done (FrCommandData *cdata)
{
if (cdata == NULL)
return;
@@ -637,13 +637,13 @@ command_done (CommandData *cdata)
void
-release_data (void)
+fr_release_data (void)
{
if (! initialized)
return;
while (CommandList != NULL) {
- CommandData *cdata = CommandList->data;
+ FrCommandData *cdata = CommandList->data;
command_done (cdata);
}
}
diff --git a/src/fr-init.h b/src/fr-init.h
index b9b210aa..f201ed36 100644
--- a/src/fr-init.h
+++ b/src/fr-init.h
@@ -33,7 +33,7 @@ typedef struct {
GAppInfo *app;
GList *file_list;
GFile *temp_dir;
-} CommandData;
+} FrCommandData;
extern GList *CommandList;
extern gint ForceDirectoryCreation;
@@ -49,17 +49,17 @@ extern int save_type[]; /* File types that can be
extern int open_type[]; /* File types that can be opened. */
extern int create_type[]; /* File types that can be created. */
-GType get_archive_type_from_mime_type (const char *mime_type,
+GType fr_get_archive_type_from_mime_type (const char *mime_type,
FrArchiveCaps requested_capabilities);
-GType get_preferred_archive_for_mime_type (const char *mime_type,
+GType fr_get_preferred_archive_for_mime_type (const char *mime_type,
FrArchiveCaps requested_capabilities);
-void update_registered_archives_capabilities (void);
+void fr_update_registered_archives_capabilities (void);
const char * _g_mime_type_get_from_extension (const char *ext);
const char * _g_mime_type_get_from_filename (GFile *file);
-const char * get_archive_filename_extension (const char *uri);
-int get_mime_type_index (const char *mime_type);
-void sort_mime_types_by_extension (int *a);
-void initialize_data (void);
-void release_data (void);
+const char * fr_get_archive_filename_extension (const char *uri);
+int fr_get_mime_type_index (const char *mime_type);
+void fr_sort_mime_types_by_extension (int *a);
+void fr_initialize_data (void);
+void fr_release_data (void);
#endif /* FR_INIT_H */
diff --git a/src/fr-new-archive-dialog.c b/src/fr-new-archive-dialog.c
index 412a5fd6..31188f1a 100644
--- a/src/fr-new-archive-dialog.c
+++ b/src/fr-new-archive-dialog.c
@@ -230,7 +230,7 @@ _fr_new_archive_dialog_construct (FrNewArchiveDialog *self,
}
gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
- sort_mime_types_by_extension (self->supported_types);
+ fr_sort_mime_types_by_extension (self->supported_types);
/* Set widgets data. */
diff --git a/src/fr-process.c b/src/fr-process.c
index 8c1378a6..d81768cc 100644
--- a/src/fr-process.c
+++ b/src/fr-process.c
@@ -50,11 +50,11 @@ typedef struct {
guint ignore_error : 1; /* whether to continue to execute
* other commands if this command
* fails. */
- ContinueFunc continue_func;
+ FrContinueFunc continue_func;
gpointer continue_data;
- ProcFunc begin_func;
+ FrProcFunc begin_func;
gpointer begin_data;
- ProcFunc end_func;
+ FrProcFunc end_func;
gpointer end_data;
} FrCommandInfo;
@@ -559,7 +559,7 @@ fr_process_set_arg_at (FrProcess *process,
void
fr_process_set_begin_func (FrProcess *process,
- ProcFunc func,
+ FrProcFunc func,
gpointer func_data)
{
FrCommandInfo *info;
@@ -575,7 +575,7 @@ fr_process_set_begin_func (FrProcess *process,
void
fr_process_set_end_func (FrProcess *process,
- ProcFunc func,
+ FrProcFunc func,
gpointer func_data)
{
FrCommandInfo *info;
@@ -591,7 +591,7 @@ fr_process_set_end_func (FrProcess *process,
void
fr_process_set_continue_func (FrProcess *process,
- ContinueFunc func,
+ FrContinueFunc func,
gpointer func_data)
{
FrCommandInfo *info;
@@ -633,7 +633,7 @@ fr_process_use_standard_locale (FrProcess *process,
void
fr_process_set_out_line_func (FrProcess *process,
- LineFunc func,
+ FrLineFunc func,
gpointer data)
{
g_return_if_fail (process != NULL);
@@ -645,7 +645,7 @@ fr_process_set_out_line_func (FrProcess *process,
void
fr_process_set_err_line_func (FrProcess *process,
- LineFunc func,
+ FrLineFunc func,
gpointer data)
{
g_return_if_fail (process != NULL);
diff --git a/src/fr-process.h b/src/fr-process.h
index c3b58352..6b9c1ea3 100644
--- a/src/fr-process.h
+++ b/src/fr-process.h
@@ -31,14 +31,14 @@
#define FR_TYPE_PROCESS (fr_process_get_type ())
G_DECLARE_FINAL_TYPE (FrProcess, fr_process, FR, PROCESS, GObject)
-typedef void (*ProcFunc) (gpointer data);
-typedef gboolean (*ContinueFunc) (FrError **error, gpointer data);
-typedef void (*LineFunc) (char *line, gpointer data);
+typedef void (*FrProcFunc) (gpointer data);
+typedef gboolean (*FrContinueFunc) (FrError **error, gpointer data);
+typedef void (*FrLineFunc) (char *line, gpointer data);
typedef struct {
GIOChannel *source;
GList *raw;
- LineFunc line_func;
+ FrLineFunc line_func;
gpointer line_data;
GIOStatus status;
GError *error;
@@ -75,13 +75,13 @@ void fr_process_set_arg_at (FrProcess *fr_proc,
int n_arg,
const char *arg);
void fr_process_set_begin_func (FrProcess *fr_proc,
- ProcFunc func,
+ FrProcFunc func,
gpointer func_data);
void fr_process_set_end_func (FrProcess *fr_proc,
- ProcFunc func,
+ FrProcFunc func,
gpointer func_data);
void fr_process_set_continue_func (FrProcess *fr_proc,
- ContinueFunc func,
+ FrContinueFunc func,
gpointer func_data);
void fr_process_end_command (FrProcess *fr_proc);
void fr_process_set_working_dir (FrProcess *fr_proc,
@@ -95,10 +95,10 @@ void fr_process_set_ignore_error (FrProcess *fr_proc,
void fr_process_use_standard_locale (FrProcess *fr_proc,
gboolean use_stand_locale);
void fr_process_set_out_line_func (FrProcess *fr_proc,
- LineFunc func,
+ FrLineFunc func,
gpointer func_data);
void fr_process_set_err_line_func (FrProcess *fr_proc,
- LineFunc func,
+ FrLineFunc func,
gpointer func_data);
void fr_process_execute (FrProcess *process,
GCancellable *cancellable,
diff --git a/src/fr-window-actions-callbacks.c b/src/fr-window-actions-callbacks.c
index 50de10ff..1f72253b 100644
--- a/src/fr-window-actions-callbacks.c
+++ b/src/fr-window-actions-callbacks.c
@@ -34,7 +34,7 @@
void
-toggle_action_activated (GSimpleAction *action,
+fr_toggle_action_activated (GSimpleAction *action,
GVariant *parameter,
gpointer data)
{
diff --git a/src/fr-window-actions-callbacks.h b/src/fr-window-actions-callbacks.h
index f63d41e9..86575acc 100644
--- a/src/fr-window-actions-callbacks.h
+++ b/src/fr-window-actions-callbacks.h
@@ -27,7 +27,7 @@
GtkWidget * _gtk_application_get_current_window (GApplication *application);
-DEF_ACTION_CALLBACK (toggle_action_activated)
+DEF_ACTION_CALLBACK (fr_toggle_action_activated)
DEF_ACTION_CALLBACK (fr_window_activate_add_files)
DEF_ACTION_CALLBACK (fr_window_activate_close)
DEF_ACTION_CALLBACK (fr_window_activate_delete)
diff --git a/src/fr-window-actions-entries.h b/src/fr-window-actions-entries.h
index 6ff45ad5..528abe86 100644
--- a/src/fr-window-actions-entries.h
+++ b/src/fr-window-actions-entries.h
@@ -66,7 +66,7 @@ static const GActionEntry fr_window_actions[] = {
},
{
.name = "find",
- .activate = toggle_action_activated,
+ .activate = fr_toggle_action_activated,
.state = "false",
.change_state = fr_window_activate_find,
},
@@ -156,7 +156,7 @@ static const GActionEntry fr_window_actions[] = {
},
{
.name = "view-sidebar",
- .activate = toggle_action_activated,
+ .activate = fr_toggle_action_activated,
.parameter_type = NULL,
.state = "false",
.change_state = fr_window_activate_view_sidebar,
diff --git a/src/fr-window.c b/src/fr-window.c
index 35888a7d..8b2470bb 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -7073,7 +7073,7 @@ _get_destination_to_avoid_tarbomb (GFile *file)
directory = g_file_get_parent (file);
name = g_file_get_basename (file);
- ext = get_archive_filename_extension (name);
+ ext = fr_get_archive_filename_extension (name);
if (ext == NULL)
/* if no extension is present add a suffix to the name... */
new_name = g_strconcat (name, "_FILES", NULL);
@@ -9082,7 +9082,7 @@ typedef struct {
FrWindow *window;
GList *file_list;
gboolean ask_application;
- CommandData *cdata;
+ FrCommandData *cdata;
} OpenFilesData;
@@ -9100,7 +9100,7 @@ open_files_data_new (FrWindow *window,
odata->window = g_object_ref (window);
odata->file_list = _g_string_list_dup (file_list);
odata->ask_application = ask_application;
- odata->cdata = g_new0 (CommandData, 1);
+ odata->cdata = g_new0 (FrCommandData, 1);
odata->cdata->temp_dir = _g_file_get_temp_work_dir (NULL);
odata->cdata->file_list = NULL;
for (scan = file_list; scan; scan = scan->next) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
