diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 14 | ||||
-rw-r--r-- | src/actions.c | 6 | ||||
-rw-r--r-- | src/dlg-add-files.c | 2 | ||||
-rw-r--r-- | src/dlg-add-folder.c | 2 | ||||
-rw-r--r-- | src/dlg-batch-add.c | 2 | ||||
-rw-r--r-- | src/dlg-extract.c | 2 | ||||
-rw-r--r-- | src/dlg-prop.c | 2 | ||||
-rw-r--r-- | src/eggtreemultidnd.c | 2 | ||||
-rw-r--r-- | src/fr-error.c | 2 | ||||
-rw-r--r-- | src/fr-window.c | 14 | ||||
-rw-r--r-- | src/gtk-utils.c | 2 | ||||
-rw-r--r-- | src/main.c | 4 | ||||
-rw-r--r-- | src/preferences.c | 2 | ||||
-rw-r--r-- | src/preferences.h | 68 | ||||
-rw-r--r-- | src/typedefs.h | 16 |
15 files changed, 70 insertions, 70 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8622fe9..008b457 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = commands sh -bin_PROGRAMS = file-roller +bin_PROGRAMS = engrampa if MKDTEMP_MISSING MKDTEMP_FILES=mkdtemp.c mkdtemp.h @@ -14,10 +14,10 @@ uidir = $(top_srcdir)/data/ui privexecdir = $(abs_top_builddir)/src/commands/ shdir = $(top_srcdir)/src/sh/ else -privdatadir = $(datadir)/file-roller/ -uidir = $(datadir)/file-roller/ui -privexecdir = $(libexecdir)/file-roller/ -shdir = $(libexecdir)/file-roller/ +privdatadir = $(datadir)/engrampa/ +uidir = $(datadir)/engrampa/ui +privexecdir = $(libexecdir)/engrampa/ +shdir = $(libexecdir)/engrampa/ endif INCLUDES = \ @@ -44,7 +44,7 @@ BUILT_SOURCES = \ fr-enum-types.h \ fr-enum-types.c -file_roller_SOURCES = \ +engrampa_SOURCES = \ actions.h \ actions.c \ dlg-add-files.c \ @@ -179,7 +179,7 @@ fr-enum-types.c: typedefs.h fr-enum-types.h && (cmp -s xgen-$(@F) fr-enum-types.c || cp xgen-$(@F) fr-enum-types.c ) \ && rm -f xgen-$(@F) ) -file_roller_LDADD = \ +engrampa_LDADD = \ $(top_builddir)/copy-n-paste/libeggsmclient.la \ $(FR_LIBS) diff --git a/src/actions.c b/src/actions.c index f44c262..01c2f5b 100644 --- a/src/actions.c +++ b/src/actions.c @@ -281,7 +281,7 @@ new_file_response_cb (GtkWidget *w, } if (response == GTK_RESPONSE_HELP) { - show_help_dialog (GTK_WINDOW (data->dialog), "file-roller-create"); + show_help_dialog (GTK_WINDOW (data->dialog), "engrampa-create"); return; } @@ -435,7 +435,7 @@ save_file_response_cb (GtkWidget *w, } if (response == GTK_RESPONSE_HELP) { - show_help_dialog (GTK_WINDOW (data->dialog), "file-roller-convert-archive"); + show_help_dialog (GTK_WINDOW (data->dialog), "engrampa-convert-archive"); return; } @@ -864,7 +864,7 @@ activate_action_about (GtkAction *action, "authors", authors, "documenters", documenters, "translator-credits", _("translator-credits"), - "logo-icon-name", "file-roller", + "logo-icon-name", "engrampa", "license", license_text, "wrap-license", TRUE, NULL); diff --git a/src/dlg-add-files.c b/src/dlg-add-files.c index 06c8be9..e8d41c5 100644 --- a/src/dlg-add-files.c +++ b/src/dlg-add-files.c @@ -75,7 +75,7 @@ file_sel_response_cb (GtkWidget *widget, } if (response == GTK_RESPONSE_HELP) { - show_help_dialog (GTK_WINDOW (data->dialog), "file-roller-add-options"); + show_help_dialog (GTK_WINDOW (data->dialog), "engrampa-add-options"); g_free (current_folder); return TRUE; } diff --git a/src/dlg-add-folder.c b/src/dlg-add-folder.c index cd9f430..cd3d0b1 100644 --- a/src/dlg-add-folder.c +++ b/src/dlg-add-folder.c @@ -109,7 +109,7 @@ file_sel_response_cb (GtkWidget *widget, } if (response == GTK_RESPONSE_HELP) { - show_help_dialog (GTK_WINDOW (data->dialog), "file-roller-add-options"); + show_help_dialog (GTK_WINDOW (data->dialog), "engrampa-add-options"); return TRUE; } diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c index 47d11e2..8171e94 100644 --- a/src/dlg-batch-add.c +++ b/src/dlg-batch-add.c @@ -134,7 +134,7 @@ static void help_clicked_cb (GtkWidget *widget, DialogData *data) { - show_help_dialog (GTK_WINDOW (data->dialog), "file-roller-fmgr-add"); + show_help_dialog (GTK_WINDOW (data->dialog), "engrampa-fmgr-add"); } diff --git a/src/dlg-extract.c b/src/dlg-extract.c index f4dd75b..34c2522 100644 --- a/src/dlg-extract.c +++ b/src/dlg-extract.c @@ -259,7 +259,7 @@ file_sel_response_cb (GtkWidget *widget, } if (response == GTK_RESPONSE_HELP) { - show_help_dialog (GTK_WINDOW (data->dialog), "file-roller-extract-options"); + show_help_dialog (GTK_WINDOW (data->dialog), "engrampa-extract-options"); return TRUE; } diff --git a/src/dlg-prop.c b/src/dlg-prop.c index e359743..59e899a 100644 --- a/src/dlg-prop.c +++ b/src/dlg-prop.c @@ -67,7 +67,7 @@ static int help_cb (GtkWidget *w, DialogData *data) { - show_help_dialog (GTK_WINDOW (data->dialog), "file-roller-view-archive-properties"); + show_help_dialog (GTK_WINDOW (data->dialog), "engrampa-view-archive-properties"); return TRUE; } diff --git a/src/eggtreemultidnd.c b/src/eggtreemultidnd.c index 5bf4698..9a4d16e 100644 --- a/src/eggtreemultidnd.c +++ b/src/eggtreemultidnd.c @@ -33,7 +33,7 @@ static GtkTargetEntry target_table[] = { { "XdndDirectSave0", 0, 0 }, - { "XdndFileRoller0", 0, 1 } + { "XdndEngrampa0", 0, 1 } }; typedef struct diff --git a/src/fr-error.c b/src/fr-error.c index ab48661..9473b6f 100644 --- a/src/fr-error.c +++ b/src/fr-error.c @@ -30,7 +30,7 @@ fr_error_quark (void) static GQuark quark; if (!quark) - quark = g_quark_from_static_string ("file_roller_error"); + quark = g_quark_from_static_string ("engrampa_error"); return quark; } diff --git a/src/fr-window.c b/src/fr-window.c index 41407c6..0f9fe50 100644 --- a/src/fr-window.c +++ b/src/fr-window.c @@ -91,22 +91,22 @@ static int dir_tree_icon_size = 0; #define XDS_ATOM gdk_atom_intern ("XdndDirectSave0", FALSE) #define TEXT_ATOM gdk_atom_intern ("text/plain", FALSE) #define OCTET_ATOM gdk_atom_intern ("application/octet-stream", FALSE) -#define XFR_ATOM gdk_atom_intern ("XdndFileRoller0", FALSE) +#define XFR_ATOM gdk_atom_intern ("XdndEngrampa0", FALSE) -#define FR_CLIPBOARD (gdk_atom_intern_static_string ("_FILE_ROLLER_SPECIAL_CLIPBOARD")) -#define FR_SPECIAL_URI_LIST (gdk_atom_intern_static_string ("application/file-roller-uri-list")) +#define FR_CLIPBOARD (gdk_atom_intern_static_string ("_RNGRAMPA_SPECIAL_CLIPBOARD")) +#define FR_SPECIAL_URI_LIST (gdk_atom_intern_static_string ("application/engrampa-uri-list")) static GtkTargetEntry clipboard_targets[] = { - { "application/file-roller-uri-list", 0, 1 } + { "application/engrampa-uri-list", 0, 1 } }; static GtkTargetEntry target_table[] = { - { "XdndFileRoller0", 0, 0 }, + { "XdndEngrampa0", 0, 0 }, { "text/uri-list", 0, 1 }, }; static GtkTargetEntry folder_tree_targets[] = { - { "XdndFileRoller0", 0, 0 }, + { "XdndEngrampa0", 0, 0 }, { "XdndDirectSave0", 0, 2 } }; @@ -2811,7 +2811,7 @@ fr_window_add_to_recent_list (FrWindow *window, recent_data = g_new0 (GtkRecentData, 1); recent_data->mime_type = g_content_type_get_mime_type (window->archive->content_type); recent_data->app_name = "File Roller"; - recent_data->app_exec = "file-roller"; + recent_data->app_exec = "engrampa"; gtk_recent_manager_add_full (window->priv->recent_manager, uri, recent_data); g_free (recent_data); diff --git a/src/gtk-utils.c b/src/gtk-utils.c index c18ec62..4d98570 100644 --- a/src/gtk-utils.c +++ b/src/gtk-utils.c @@ -769,7 +769,7 @@ show_help_dialog (GtkWindow *parent, char *uri; GError *error = NULL; - uri = g_strconcat ("ghelp:file-roller", section ? "?" : NULL, section, NULL); + uri = g_strconcat ("ghelp:engrampa", section ? "?" : NULL, section, NULL); if (! show_uri (gtk_window_get_screen (parent), uri, GDK_CURRENT_TIME, &error)) { GtkWidget *dialog; @@ -312,7 +312,7 @@ main (int argc, char **argv) g_option_context_free (context); g_set_application_name (_("File Roller")); - gtk_window_set_default_icon_name ("file-roller"); + gtk_window_set_default_icon_name ("engrampa"); client = egg_sm_client_get (); g_signal_connect (client, "save-state", G_CALLBACK (fr_save_state), NULL); @@ -335,7 +335,7 @@ main (int argc, char **argv) static void initialize_data (void) { - eel_mateconf_monitor_add ("/apps/file-roller"); + eel_mateconf_monitor_add ("/apps/engrampa"); eel_mateconf_monitor_add (PREF_CAJA_CLICK_POLICY); ProgramsCache = g_hash_table_new_full (g_str_hash, diff --git a/src/preferences.c b/src/preferences.c index 6ca6d70..970cb46 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -30,7 +30,7 @@ #include "fr-window.h" -#define DIALOG_PREFIX "/apps/file-roller/dialogs/" +#define DIALOG_PREFIX "/apps/engrampa/dialogs/" typedef struct { diff --git a/src/preferences.h b/src/preferences.h index 6a9224f..311f02e 100644 --- a/src/preferences.h +++ b/src/preferences.h @@ -27,45 +27,45 @@ #include "typedefs.h" #include "fr-window.h" -#define PREF_LIST_SORT_METHOD "/apps/file-roller/listing/sort_method" -#define PREF_LIST_SORT_TYPE "/apps/file-roller/listing/sort_type" -#define PREF_LIST_MODE "/apps/file-roller/listing/list_mode" -#define PREF_LIST_SHOW_TYPE "/apps/file-roller/listing/show_type" -#define PREF_LIST_SHOW_SIZE "/apps/file-roller/listing/show_size" -#define PREF_LIST_SHOW_TIME "/apps/file-roller/listing/show_time" -#define PREF_LIST_SHOW_PATH "/apps/file-roller/listing/show_path" -#define PREF_LIST_USE_MIME_ICONS "/apps/file-roller/listing/use_mime_icons" -#define PREF_NAME_COLUMN_WIDTH "/apps/file-roller/listing/name_column_width" +#define PREF_LIST_SORT_METHOD "/apps/engrampa/listing/sort_method" +#define PREF_LIST_SORT_TYPE "/apps/engrampa/listing/sort_type" +#define PREF_LIST_MODE "/apps/engrampa/listing/list_mode" +#define PREF_LIST_SHOW_TYPE "/apps/engrampa/listing/show_type" +#define PREF_LIST_SHOW_SIZE "/apps/engrampa/listing/show_size" +#define PREF_LIST_SHOW_TIME "/apps/engrampa/listing/show_time" +#define PREF_LIST_SHOW_PATH "/apps/engrampa/listing/show_path" +#define PREF_LIST_USE_MIME_ICONS "/apps/engrampa/listing/use_mime_icons" +#define PREF_NAME_COLUMN_WIDTH "/apps/engrampa/listing/name_column_width" -#define PREF_UI_WINDOW_WIDTH "/apps/file-roller/ui/window_width" -#define PREF_UI_WINDOW_HEIGHT "/apps/file-roller/ui/window_height" -#define PREF_UI_SIDEBAR_WIDTH "/apps/file-roller/ui/sidebar_width" -#define PREF_UI_HISTORY_LEN "/apps/file-roller/ui/history_len" -#define PREF_UI_TOOLBAR "/apps/file-roller/ui/view_toolbar" -#define PREF_UI_STATUSBAR "/apps/file-roller/ui/view_statusbar" -#define PREF_UI_FOLDERS "/apps/file-roller/ui/view_folders" +#define PREF_UI_WINDOW_WIDTH "/apps/engrampa/ui/window_width" +#define PREF_UI_WINDOW_HEIGHT "/apps/engrampa/ui/window_height" +#define PREF_UI_SIDEBAR_WIDTH "/apps/engrampa/ui/sidebar_width" +#define PREF_UI_HISTORY_LEN "/apps/engrampa/ui/history_len" +#define PREF_UI_TOOLBAR "/apps/engrampa/ui/view_toolbar" +#define PREF_UI_STATUSBAR "/apps/engrampa/ui/view_statusbar" +#define PREF_UI_FOLDERS "/apps/engrampa/ui/view_folders" -#define PREF_EDIT_EDITORS "/apps/file-roller/general/editors" -#define PREF_ADD_COMPRESSION_LEVEL "/apps/file-roller/general/compression_level" -#define PREF_ENCRYPT_HEADER "/apps/file-roller/general/encrypt_header" -#define PREF_MIGRATE_DIRECTORIES "/apps/file-roller/general/migrate_directories" +#define PREF_EDIT_EDITORS "/apps/engrampa/general/editors" +#define PREF_ADD_COMPRESSION_LEVEL "/apps/engrampa/general/compression_level" +#define PREF_ENCRYPT_HEADER "/apps/engrampa/general/encrypt_header" +#define PREF_MIGRATE_DIRECTORIES "/apps/engrampa/general/migrate_directories" -#define PREF_EXTRACT_OVERWRITE "/apps/file-roller/dialogs/extract/overwrite" -#define PREF_EXTRACT_SKIP_NEWER "/apps/file-roller/dialogs/extract/skip_newer" -#define PREF_EXTRACT_RECREATE_FOLDERS "/apps/file-roller/dialogs/extract/recreate_folders" +#define PREF_EXTRACT_OVERWRITE "/apps/engrampa/dialogs/extract/overwrite" +#define PREF_EXTRACT_SKIP_NEWER "/apps/engrampa/dialogs/extract/skip_newer" +#define PREF_EXTRACT_RECREATE_FOLDERS "/apps/engrampa/dialogs/extract/recreate_folders" -#define PREF_ADD_CURRENT_FOLDER "/apps/file-roller/dialogs/add/current_folder" -#define PREF_ADD_FILENAME "/apps/file-roller/dialogs/add/filename" -#define PREF_ADD_INCLUDE_FILES "/apps/file-roller/dialogs/add/include_files" -#define PREF_ADD_EXCLUDE_FILES "/apps/file-roller/dialogs/add/exclude_files" -#define PREF_ADD_EXCLUDE_FOLDERS "/apps/file-roller/dialogs/add/exclude_folders" -#define PREF_ADD_UPDATE "/apps/file-roller/dialogs/add/update" -#define PREF_ADD_RECURSIVE "/apps/file-roller/dialogs/add/recursive" -#define PREF_ADD_NO_SYMLINKS "/apps/file-roller/dialogs/add/no_symlinks" +#define PREF_ADD_CURRENT_FOLDER "/apps/engrampa/dialogs/add/current_folder" +#define PREF_ADD_FILENAME "/apps/engrampa/dialogs/add/filename" +#define PREF_ADD_INCLUDE_FILES "/apps/engrampa/dialogs/add/include_files" +#define PREF_ADD_EXCLUDE_FILES "/apps/engrampa/dialogs/add/exclude_files" +#define PREF_ADD_EXCLUDE_FOLDERS "/apps/engrampa/dialogs/add/exclude_folders" +#define PREF_ADD_UPDATE "/apps/engrampa/dialogs/add/update" +#define PREF_ADD_RECURSIVE "/apps/engrampa/dialogs/add/recursive" +#define PREF_ADD_NO_SYMLINKS "/apps/engrampa/dialogs/add/no_symlinks" -#define PREF_BATCH_ADD_DEFAULT_EXTENSION "/apps/file-roller/dialogs/batch-add/default_extension" -#define PREF_BATCH_OTHER_OPTIONS "/apps/file-roller/dialogs/batch-add/other_options" -#define PREF_BATCH_VOLUME_SIZE "/apps/file-roller/dialogs/batch-add/volume_size" +#define PREF_BATCH_ADD_DEFAULT_EXTENSION "/apps/engrampa/dialogs/batch-add/default_extension" +#define PREF_BATCH_OTHER_OPTIONS "/apps/engrampa/dialogs/batch-add/other_options" +#define PREF_BATCH_VOLUME_SIZE "/apps/engrampa/dialogs/batch-add/volume_size" #define PREF_DESKTOP_ICON_THEME "/desktop/mate/file_views/icon_theme" #define PREF_DESKTOP_MENUS_HAVE_TEAROFF "/desktop/mate/interface/menus_have_tearoff" diff --git a/src/typedefs.h b/src/typedefs.h index 36f2c90..c679bf9 100644 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -25,14 +25,14 @@ #define MEGABYTE (1024 * 1024) -#define RC_DIR ".mate2/file-roller" -#define RC_BOOKMARKS_FILE ".mate2/file-roller/bookmarks" -#define RC_RECENT_FILE ".mate2/file-roller/recents" -#define RC_OPTIONS_DIR ".mate2/file-roller/options" - -#define OLD_RC_BOOKMARKS_FILE ".file-roller/bookmarks" -#define OLD_RC_RECENT_FILE ".file-roller/recents" -#define OLD_RC_OPTIONS_DIR ".file-roller/options" +#define RC_DIR ".mate2/engrampa" +#define RC_BOOKMARKS_FILE ".mate2/engrampa/bookmarks" +#define RC_RECENT_FILE ".mate2/engrampa/recents" +#define RC_OPTIONS_DIR ".mate2/engrampa/options" + +#define OLD_RC_BOOKMARKS_FILE ".engrampa/bookmarks" +#define OLD_RC_RECENT_FILE ".engrampa/recents" +#define OLD_RC_OPTIONS_DIR ".engrampa/options" typedef enum { /*< skip >*/ FR_WINDOW_SORT_BY_NAME = 0, |