diff options
| author | rbuj <[email protected]> | 2022-07-25 12:19:55 +0200 |
|---|---|---|
| committer | rbuj <[email protected]> | 2022-07-25 12:19:55 +0200 |
| commit | bd3a4bf30590819b3dd54032644098cca27182dc (patch) | |
| tree | 4827cd31a0d456649618a84f5bb180f0c6078ddf | |
| parent | 84b1bd2cdb55d1a293c7f19ee4585c1eeeac2879 (diff) | |
| download | engrampa-drop-uricmp.tar.bz2 engrampa-drop-uricmp.tar.xz | |
file-utils: drop uricmpdrop-uricmp
| -rw-r--r-- | src/dlg-update.c | 2 | ||||
| -rw-r--r-- | src/file-utils.c | 7 | ||||
| -rw-r--r-- | src/file-utils.h | 2 | ||||
| -rw-r--r-- | src/fr-archive.c | 4 | ||||
| -rw-r--r-- | src/fr-window.c | 2 |
5 files changed, 4 insertions, 13 deletions
diff --git a/src/dlg-update.c b/src/dlg-update.c index be3a21d..38b49ca 100644 --- a/src/dlg-update.c +++ b/src/dlg-update.c @@ -373,7 +373,7 @@ dlg_update_add_file (gpointer dialog, for (scan = data->file_list; scan; scan = scan->next) { OpenFile *test = scan->data; - if (uricmp (test->extracted_uri, file->extracted_uri) == 0) + if (g_strcmp0 (test->extracted_uri, file->extracted_uri) == 0) return; } diff --git a/src/file-utils.c b/src/file-utils.c index 64e3b30..d624756 100644 --- a/src/file-utils.c +++ b/src/file-utils.c @@ -1242,13 +1242,6 @@ get_uri_root (const char *uri) return root; } -int -uricmp (const char *uri1, - const char *uri2) -{ - return g_strcmp0 (uri1, uri2); -} - char * get_alternative_uri (const char *folder, const char *name) diff --git a/src/file-utils.h b/src/file-utils.h index 2d726fe..4acb498 100644 --- a/src/file-utils.h +++ b/src/file-utils.h @@ -114,8 +114,6 @@ GFile * get_user_config_subdirectory (const char *child_name, const char * remove_host_from_uri (const char *uri); char * get_uri_host (const char *uri); char * get_uri_root (const char *uri); -int uricmp (const char *uri1, - const char *uri2); char * get_alternative_uri (const char *folder, const char *name); char * get_alternative_uri_for_uri (const char *uri); diff --git a/src/fr-archive.c b/src/fr-archive.c index 301968f..14ecac8 100644 --- a/src/fr-archive.c +++ b/src/fr-archive.c @@ -756,7 +756,7 @@ move_here (FrArchive *archive) parent = remove_level_from_path (content_uri); - if (uricmp (parent, archive->priv->extraction_destination) == 0) { + if (g_strcmp0 (parent, archive->priv->extraction_destination) == 0) { char *new_uri; new_uri = get_alternative_uri_for_uri (archive->priv->extraction_destination); @@ -2368,7 +2368,7 @@ fr_archive_add_dropped_items (FrArchive *archive, /* FIXME: make this check for all the add actions */ archive_uri = g_file_get_uri (archive->file); for (scan = item_list; scan; scan = scan->next) { - if (uricmp (scan->data, archive_uri) == 0) { + if (g_strcmp0 (scan->data, archive_uri) == 0) { g_free (archive_uri); fr_archive_action_completed (archive, FR_ACTION_ADDING_FILES, diff --git a/src/fr-window.c b/src/fr-window.c index dd68dca..ec6455e 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -8155,7 +8155,7 @@ open_file_modified_cb (GFileMonitor *monitor, file = NULL; for (scan = window->priv->open_files; scan; scan = scan->next) { OpenFile *test = scan->data; - if (uricmp (test->extracted_uri, monitor_uri) == 0) { + if (g_strcmp0 (test->extracted_uri, monitor_uri) == 0) { file = test; break; } |