From 21b3ff82393313b00f352c84cdd21c40fb84e27e Mon Sep 17 00:00:00 2001 From: Perberos Date: Wed, 9 Nov 2011 23:50:08 -0300 Subject: renaming fileroller to engrampa --- caja/Makefile.am | 14 +- caja/caja-engrampa.c | 431 +++++++++++++++++++++++++++++++++++++++++++++++ caja/caja-engrampa.h | 51 ++++++ caja/caja-fileroller.c | 431 ----------------------------------------------- caja/caja-fileroller.h | 51 ------ caja/engrampa-module.c | 56 ++++++ caja/fileroller-module.c | 56 ------ 7 files changed, 545 insertions(+), 545 deletions(-) create mode 100644 caja/caja-engrampa.c create mode 100644 caja/caja-engrampa.h delete mode 100644 caja/caja-fileroller.c delete mode 100644 caja/caja-fileroller.h create mode 100644 caja/engrampa-module.c delete mode 100644 caja/fileroller-module.c (limited to 'caja') diff --git a/caja/Makefile.am b/caja/Makefile.am index e72c1d6..a2a8ce0 100644 --- a/caja/Makefile.am +++ b/caja/Makefile.am @@ -9,14 +9,14 @@ INCLUDES = \ caja_extensiondir=$(CAJA_EXTENSION_DIR) -caja_extension_LTLIBRARIES=libcaja-fileroller.la +caja_extension_LTLIBRARIES=libcaja-engrampa.la -libcaja_fileroller_la_SOURCES = \ - caja-fileroller.c \ - caja-fileroller.h \ - fileroller-module.c +libcaja_engrampa_la_SOURCES = \ + caja-engrampa.c \ + caja-engrampa.h \ + engrampa-module.c -libcaja_fileroller_la_LDFLAGS = -module -avoid-version -no-undefined -libcaja_fileroller_la_LIBADD = $(CAJA_LIBS) +libcaja_engrampa_la_LDFLAGS = -module -avoid-version -no-undefined +libcaja_engrampa_la_LIBADD = $(CAJA_LIBS) -include $(top_srcdir)/git.mk diff --git a/caja/caja-engrampa.c b/caja/caja-engrampa.c new file mode 100644 index 0000000..6f6944e --- /dev/null +++ b/caja/caja-engrampa.c @@ -0,0 +1,431 @@ +/* + * File-Roller + * + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * This library 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. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Author: Paolo Bacchilega + * + */ + +#include +#include +#include +#include +#include +#include +#include +#include "caja-engrampa.h" + + +static GObjectClass *parent_class; + + +static void +extract_to_callback (CajaMenuItem *item, + gpointer user_data) +{ + GList *files; + CajaFileInfo *file; + char *uri, *default_dir; + GString *cmd; + + files = g_object_get_data (G_OBJECT (item), "files"); + file = files->data; + + uri = caja_file_info_get_uri (file); + default_dir = caja_file_info_get_parent_uri (file); + + cmd = g_string_new ("engrampa"); + g_string_append_printf (cmd, + " --default-dir=%s --extract %s", + g_shell_quote (default_dir), + g_shell_quote (uri)); + +#ifdef DEBUG + g_print ("EXEC: %s\n", cmd->str); +#endif + + g_spawn_command_line_async (cmd->str, NULL); + + g_string_free (cmd, TRUE); + g_free (default_dir); + g_free (uri); +} + + +static void +extract_here_callback (CajaMenuItem *item, + gpointer user_data) +{ + GList *files, *scan; + CajaFileInfo *file; + char *dir; + GString *cmd; + + files = g_object_get_data (G_OBJECT (item), "files"); + file = files->data; + + dir = caja_file_info_get_parent_uri (file); + + cmd = g_string_new ("engrampa"); + g_string_append_printf (cmd," --extract-here"); + + g_free (dir); + + for (scan = files; scan; scan = scan->next) { + CajaFileInfo *file = scan->data; + char *uri; + + uri = caja_file_info_get_uri (file); + g_string_append_printf (cmd, " %s", g_shell_quote (uri)); + g_free (uri); + } + + g_spawn_command_line_async (cmd->str, NULL); + +#ifdef DEBUG + g_print ("EXEC: %s\n", cmd->str); +#endif + + g_string_free (cmd, TRUE); +} + + +static void +add_callback (CajaMenuItem *item, + gpointer user_data) +{ + GList *files, *scan; + CajaFileInfo *file; + char *uri, *dir; + GString *cmd; + + files = g_object_get_data (G_OBJECT (item), "files"); + file = files->data; + + uri = caja_file_info_get_uri (file); + dir = g_path_get_dirname (uri); + + cmd = g_string_new ("engrampa"); + g_string_append_printf (cmd," --default-dir=%s --add", g_shell_quote (dir)); + + g_free (dir); + g_free (uri); + + for (scan = files; scan; scan = scan->next) { + CajaFileInfo *file = scan->data; + + uri = caja_file_info_get_uri (file); + g_string_append_printf (cmd, " %s", g_shell_quote (uri)); + g_free (uri); + } + + g_spawn_command_line_async (cmd->str, NULL); + + g_string_free (cmd, TRUE); +} + + +static char *mime_types[] = { + "application/x-7z-compressed", + "application/x-7z-compressed-tar", + "application/x-ace", + "application/x-alz", + "application/x-ar", + "application/x-arj", + "application/x-bzip", + "application/x-bzip-compressed-tar", + "application/x-bzip1", + "application/x-bzip1-compressed-tar", + "application/vnd.ms-cab-compressed", + "application/x-cbr", + "application/x-cbz", + "application/x-cd-image", + "application/x-compress", + "application/x-compressed-tar", + "application/x-cpio", + "application/x-deb", + "application/x-ear", + "application/x-ms-dos-executable", + "application/x-gtar", + "application/x-gzip", + "application/x-gzpostscript", + "application/x-java-archive", + "application/x-lha", + "application/x-lhz", + "application/x-lzip", + "application/x-lzip-compressed-tar", + "application/x-lzma", + "application/x-lzma-compressed-tar", + "application/x-lzop", + "application/x-lzop-compressed-tar", + "application/x-rar", + "application/x-rar-compressed", + "application/x-rpm", + "application/x-rzip", + "application/x-tar", + "application/x-tarz", + "application/x-stuffit", + "application/x-war", + "application/x-xz", + "application/x-xz-compressed-tar", + "application/x-zip", + "application/x-zip-compressed", + "application/x-zoo", + "application/zip", + "multipart/x-zip", + NULL +}; + + +typedef struct +{ + gboolean is_archive; + gboolean is_derived_archive; +} FileMimeInfo; + + +static FileMimeInfo +get_file_mime_info (CajaFileInfo *file) +{ + FileMimeInfo file_mime_info; + int i; + + file_mime_info.is_archive = FALSE; + file_mime_info.is_derived_archive = FALSE; + + for (i = 0; mime_types[i] != NULL; i++) + if (caja_file_info_is_mime_type (file, mime_types[i])) { + char *mime_type; + char *content_type_mime_file; + char *content_type_mime_compare; + + mime_type = caja_file_info_get_mime_type (file); + + content_type_mime_file = g_content_type_from_mime_type (mime_type); + content_type_mime_compare = g_content_type_from_mime_type (mime_types[i]); + + file_mime_info.is_archive = TRUE; + if ((content_type_mime_file != NULL) && (content_type_mime_compare != NULL)) + file_mime_info.is_derived_archive = ! g_content_type_equals (content_type_mime_file, content_type_mime_compare); + + g_free (mime_type); + g_free (content_type_mime_file); + g_free (content_type_mime_compare); + + return file_mime_info; + } + + return file_mime_info; +} + + +static gboolean +unsupported_scheme (CajaFileInfo *file) +{ + gboolean result = FALSE; + GFile *location; + char *scheme; + + location = caja_file_info_get_location (file); + scheme = g_file_get_uri_scheme (location); + + if (scheme != NULL) { + const char *unsupported[] = { "trash", "computer", NULL }; + int i; + + for (i = 0; unsupported[i] != NULL; i++) + if (strcmp (scheme, unsupported[i]) == 0) + result = TRUE; + } + + g_free (scheme); + g_object_unref (location); + + return result; +} + + +static GList * +caja_fr_get_file_items (CajaMenuProvider *provider, + GtkWidget *window, + GList *files) +{ + GList *items = NULL; + GList *scan; + gboolean can_write = TRUE; + gboolean one_item; + gboolean one_archive = FALSE; + gboolean one_derived_archive = FALSE; + gboolean all_archives = TRUE; + gboolean all_archives_derived = TRUE; + + if (files == NULL) + return NULL; + + if (unsupported_scheme ((CajaFileInfo *) files->data)) + return NULL; + + for (scan = files; scan; scan = scan->next) { + CajaFileInfo *file = scan->data; + FileMimeInfo file_mime_info; + + file_mime_info = get_file_mime_info (file); + + if (all_archives && ! file_mime_info.is_archive) + all_archives = FALSE; + + if (all_archives_derived && file_mime_info.is_archive && ! file_mime_info.is_derived_archive) + all_archives_derived = FALSE; + + if (can_write) { + CajaFileInfo *parent; + + parent = caja_file_info_get_parent_info (file); + can_write = caja_file_info_can_write (parent); + } + } + + /**/ + + one_item = (files != NULL) && (files->next == NULL); + one_archive = one_item && all_archives; + one_derived_archive = one_archive && all_archives_derived; + + if (all_archives && can_write) { + CajaMenuItem *item; + + item = caja_menu_item_new ("CajaFr::extract_here", + _("Extract Here"), + /* Translators: the current position is the current folder */ + _("Extract the selected archive to the current position"), + "drive-harddisk"); + g_signal_connect (item, + "activate", + G_CALLBACK (extract_here_callback), + provider); + g_object_set_data_full (G_OBJECT (item), + "files", + caja_file_info_list_copy (files), + (GDestroyNotify) caja_file_info_list_free); + + items = g_list_append (items, item); + } + else if (all_archives && ! can_write) { + CajaMenuItem *item; + + item = caja_menu_item_new ("CajaFr::extract_to", + _("Extract To..."), + _("Extract the selected archive"), + "drive-harddisk"); + g_signal_connect (item, + "activate", + G_CALLBACK (extract_to_callback), + provider); + g_object_set_data_full (G_OBJECT (item), + "files", + caja_file_info_list_copy (files), + (GDestroyNotify) caja_file_info_list_free); + + items = g_list_append (items, item); + + } + + if (! one_archive || one_derived_archive) { + CajaMenuItem *item; + + item = caja_menu_item_new ("CajaFr::add", + _("Compress..."), + _("Create a compressed archive with the selected objects"), + "mate-mime-application-x-archive"); + g_signal_connect (item, + "activate", + G_CALLBACK (add_callback), + provider); + g_object_set_data_full (G_OBJECT (item), + "files", + caja_file_info_list_copy (files), + (GDestroyNotify) caja_file_info_list_free); + + items = g_list_append (items, item); + } + + return items; +} + + +static void +caja_fr_menu_provider_iface_init (CajaMenuProviderIface *iface) +{ + iface->get_file_items = caja_fr_get_file_items; +} + + +static void +caja_fr_instance_init (CajaFr *fr) +{ +} + + +static void +caja_fr_class_init (CajaFrClass *class) +{ + parent_class = g_type_class_peek_parent (class); +} + + +static GType fr_type = 0; + + +GType +caja_fr_get_type (void) +{ + return fr_type; +} + + +void +caja_fr_register_type (GTypeModule *module) +{ + static const GTypeInfo info = { + sizeof (CajaFrClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) caja_fr_class_init, + NULL, + NULL, + sizeof (CajaFr), + 0, + (GInstanceInitFunc) caja_fr_instance_init, + }; + + static const GInterfaceInfo menu_provider_iface_info = { + (GInterfaceInitFunc) caja_fr_menu_provider_iface_init, + NULL, + NULL + }; + + fr_type = g_type_module_register_type (module, + G_TYPE_OBJECT, + "CajaEngrampa", + &info, 0); + + g_type_module_add_interface (module, + fr_type, + CAJA_TYPE_MENU_PROVIDER, + &menu_provider_iface_info); +} diff --git a/caja/caja-engrampa.h b/caja/caja-engrampa.h new file mode 100644 index 0000000..d41f55d --- /dev/null +++ b/caja/caja-engrampa.h @@ -0,0 +1,51 @@ +/* + * File-Roller + * + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * This library 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. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Author: Paolo Bacchilega + * + */ + +#ifndef CAJA_RNGRAMPA_H +#define CAJA_RNGRAMPA_H + +#include + +G_BEGIN_DECLS + +#define CAJA_TYPE_FR (caja_fr_get_type ()) +#define CAJA_FR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CAJA_TYPE_FR, CajaFr)) +#define CAJA_IS_FR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CAJA_TYPE_FR)) + +typedef struct _CajaFr CajaFr; +typedef struct _CajaFrClass CajaFrClass; + +struct _CajaFr { + GObject __parent; +}; + +struct _CajaFrClass { + GObjectClass __parent; +}; + +GType caja_fr_get_type (void); +void caja_fr_register_type (GTypeModule *module); + +G_END_DECLS + +#endif /* CAJA_RNGRAMPA_H */ diff --git a/caja/caja-fileroller.c b/caja/caja-fileroller.c deleted file mode 100644 index c6864d8..0000000 --- a/caja/caja-fileroller.c +++ /dev/null @@ -1,431 +0,0 @@ -/* - * File-Roller - * - * Copyright (C) 2004 Free Software Foundation, Inc. - * - * This library 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. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Author: Paolo Bacchilega - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include "caja-fileroller.h" - - -static GObjectClass *parent_class; - - -static void -extract_to_callback (CajaMenuItem *item, - gpointer user_data) -{ - GList *files; - CajaFileInfo *file; - char *uri, *default_dir; - GString *cmd; - - files = g_object_get_data (G_OBJECT (item), "files"); - file = files->data; - - uri = caja_file_info_get_uri (file); - default_dir = caja_file_info_get_parent_uri (file); - - cmd = g_string_new ("file-roller"); - g_string_append_printf (cmd, - " --default-dir=%s --extract %s", - g_shell_quote (default_dir), - g_shell_quote (uri)); - -#ifdef DEBUG - g_print ("EXEC: %s\n", cmd->str); -#endif - - g_spawn_command_line_async (cmd->str, NULL); - - g_string_free (cmd, TRUE); - g_free (default_dir); - g_free (uri); -} - - -static void -extract_here_callback (CajaMenuItem *item, - gpointer user_data) -{ - GList *files, *scan; - CajaFileInfo *file; - char *dir; - GString *cmd; - - files = g_object_get_data (G_OBJECT (item), "files"); - file = files->data; - - dir = caja_file_info_get_parent_uri (file); - - cmd = g_string_new ("file-roller"); - g_string_append_printf (cmd," --extract-here"); - - g_free (dir); - - for (scan = files; scan; scan = scan->next) { - CajaFileInfo *file = scan->data; - char *uri; - - uri = caja_file_info_get_uri (file); - g_string_append_printf (cmd, " %s", g_shell_quote (uri)); - g_free (uri); - } - - g_spawn_command_line_async (cmd->str, NULL); - -#ifdef DEBUG - g_print ("EXEC: %s\n", cmd->str); -#endif - - g_string_free (cmd, TRUE); -} - - -static void -add_callback (CajaMenuItem *item, - gpointer user_data) -{ - GList *files, *scan; - CajaFileInfo *file; - char *uri, *dir; - GString *cmd; - - files = g_object_get_data (G_OBJECT (item), "files"); - file = files->data; - - uri = caja_file_info_get_uri (file); - dir = g_path_get_dirname (uri); - - cmd = g_string_new ("file-roller"); - g_string_append_printf (cmd," --default-dir=%s --add", g_shell_quote (dir)); - - g_free (dir); - g_free (uri); - - for (scan = files; scan; scan = scan->next) { - CajaFileInfo *file = scan->data; - - uri = caja_file_info_get_uri (file); - g_string_append_printf (cmd, " %s", g_shell_quote (uri)); - g_free (uri); - } - - g_spawn_command_line_async (cmd->str, NULL); - - g_string_free (cmd, TRUE); -} - - -static char *mime_types[] = { - "application/x-7z-compressed", - "application/x-7z-compressed-tar", - "application/x-ace", - "application/x-alz", - "application/x-ar", - "application/x-arj", - "application/x-bzip", - "application/x-bzip-compressed-tar", - "application/x-bzip1", - "application/x-bzip1-compressed-tar", - "application/vnd.ms-cab-compressed", - "application/x-cbr", - "application/x-cbz", - "application/x-cd-image", - "application/x-compress", - "application/x-compressed-tar", - "application/x-cpio", - "application/x-deb", - "application/x-ear", - "application/x-ms-dos-executable", - "application/x-gtar", - "application/x-gzip", - "application/x-gzpostscript", - "application/x-java-archive", - "application/x-lha", - "application/x-lhz", - "application/x-lzip", - "application/x-lzip-compressed-tar", - "application/x-lzma", - "application/x-lzma-compressed-tar", - "application/x-lzop", - "application/x-lzop-compressed-tar", - "application/x-rar", - "application/x-rar-compressed", - "application/x-rpm", - "application/x-rzip", - "application/x-tar", - "application/x-tarz", - "application/x-stuffit", - "application/x-war", - "application/x-xz", - "application/x-xz-compressed-tar", - "application/x-zip", - "application/x-zip-compressed", - "application/x-zoo", - "application/zip", - "multipart/x-zip", - NULL -}; - - -typedef struct -{ - gboolean is_archive; - gboolean is_derived_archive; -} FileMimeInfo; - - -static FileMimeInfo -get_file_mime_info (CajaFileInfo *file) -{ - FileMimeInfo file_mime_info; - int i; - - file_mime_info.is_archive = FALSE; - file_mime_info.is_derived_archive = FALSE; - - for (i = 0; mime_types[i] != NULL; i++) - if (caja_file_info_is_mime_type (file, mime_types[i])) { - char *mime_type; - char *content_type_mime_file; - char *content_type_mime_compare; - - mime_type = caja_file_info_get_mime_type (file); - - content_type_mime_file = g_content_type_from_mime_type (mime_type); - content_type_mime_compare = g_content_type_from_mime_type (mime_types[i]); - - file_mime_info.is_archive = TRUE; - if ((content_type_mime_file != NULL) && (content_type_mime_compare != NULL)) - file_mime_info.is_derived_archive = ! g_content_type_equals (content_type_mime_file, content_type_mime_compare); - - g_free (mime_type); - g_free (content_type_mime_file); - g_free (content_type_mime_compare); - - return file_mime_info; - } - - return file_mime_info; -} - - -static gboolean -unsupported_scheme (CajaFileInfo *file) -{ - gboolean result = FALSE; - GFile *location; - char *scheme; - - location = caja_file_info_get_location (file); - scheme = g_file_get_uri_scheme (location); - - if (scheme != NULL) { - const char *unsupported[] = { "trash", "computer", NULL }; - int i; - - for (i = 0; unsupported[i] != NULL; i++) - if (strcmp (scheme, unsupported[i]) == 0) - result = TRUE; - } - - g_free (scheme); - g_object_unref (location); - - return result; -} - - -static GList * -caja_fr_get_file_items (CajaMenuProvider *provider, - GtkWidget *window, - GList *files) -{ - GList *items = NULL; - GList *scan; - gboolean can_write = TRUE; - gboolean one_item; - gboolean one_archive = FALSE; - gboolean one_derived_archive = FALSE; - gboolean all_archives = TRUE; - gboolean all_archives_derived = TRUE; - - if (files == NULL) - return NULL; - - if (unsupported_scheme ((CajaFileInfo *) files->data)) - return NULL; - - for (scan = files; scan; scan = scan->next) { - CajaFileInfo *file = scan->data; - FileMimeInfo file_mime_info; - - file_mime_info = get_file_mime_info (file); - - if (all_archives && ! file_mime_info.is_archive) - all_archives = FALSE; - - if (all_archives_derived && file_mime_info.is_archive && ! file_mime_info.is_derived_archive) - all_archives_derived = FALSE; - - if (can_write) { - CajaFileInfo *parent; - - parent = caja_file_info_get_parent_info (file); - can_write = caja_file_info_can_write (parent); - } - } - - /**/ - - one_item = (files != NULL) && (files->next == NULL); - one_archive = one_item && all_archives; - one_derived_archive = one_archive && all_archives_derived; - - if (all_archives && can_write) { - CajaMenuItem *item; - - item = caja_menu_item_new ("CajaFr::extract_here", - _("Extract Here"), - /* Translators: the current position is the current folder */ - _("Extract the selected archive to the current position"), - "drive-harddisk"); - g_signal_connect (item, - "activate", - G_CALLBACK (extract_here_callback), - provider); - g_object_set_data_full (G_OBJECT (item), - "files", - caja_file_info_list_copy (files), - (GDestroyNotify) caja_file_info_list_free); - - items = g_list_append (items, item); - } - else if (all_archives && ! can_write) { - CajaMenuItem *item; - - item = caja_menu_item_new ("CajaFr::extract_to", - _("Extract To..."), - _("Extract the selected archive"), - "drive-harddisk"); - g_signal_connect (item, - "activate", - G_CALLBACK (extract_to_callback), - provider); - g_object_set_data_full (G_OBJECT (item), - "files", - caja_file_info_list_copy (files), - (GDestroyNotify) caja_file_info_list_free); - - items = g_list_append (items, item); - - } - - if (! one_archive || one_derived_archive) { - CajaMenuItem *item; - - item = caja_menu_item_new ("CajaFr::add", - _("Compress..."), - _("Create a compressed archive with the selected objects"), - "mate-mime-application-x-archive"); - g_signal_connect (item, - "activate", - G_CALLBACK (add_callback), - provider); - g_object_set_data_full (G_OBJECT (item), - "files", - caja_file_info_list_copy (files), - (GDestroyNotify) caja_file_info_list_free); - - items = g_list_append (items, item); - } - - return items; -} - - -static void -caja_fr_menu_provider_iface_init (CajaMenuProviderIface *iface) -{ - iface->get_file_items = caja_fr_get_file_items; -} - - -static void -caja_fr_instance_init (CajaFr *fr) -{ -} - - -static void -caja_fr_class_init (CajaFrClass *class) -{ - parent_class = g_type_class_peek_parent (class); -} - - -static GType fr_type = 0; - - -GType -caja_fr_get_type (void) -{ - return fr_type; -} - - -void -caja_fr_register_type (GTypeModule *module) -{ - static const GTypeInfo info = { - sizeof (CajaFrClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) caja_fr_class_init, - NULL, - NULL, - sizeof (CajaFr), - 0, - (GInstanceInitFunc) caja_fr_instance_init, - }; - - static const GInterfaceInfo menu_provider_iface_info = { - (GInterfaceInitFunc) caja_fr_menu_provider_iface_init, - NULL, - NULL - }; - - fr_type = g_type_module_register_type (module, - G_TYPE_OBJECT, - "CajaFileRoller", - &info, 0); - - g_type_module_add_interface (module, - fr_type, - CAJA_TYPE_MENU_PROVIDER, - &menu_provider_iface_info); -} diff --git a/caja/caja-fileroller.h b/caja/caja-fileroller.h deleted file mode 100644 index 41a28ab..0000000 --- a/caja/caja-fileroller.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * File-Roller - * - * Copyright (C) 2004 Free Software Foundation, Inc. - * - * This library 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. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Author: Paolo Bacchilega - * - */ - -#ifndef CAJA_FILEROLLER_H -#define CAJA_FILEROLLER_H - -#include - -G_BEGIN_DECLS - -#define CAJA_TYPE_FR (caja_fr_get_type ()) -#define CAJA_FR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CAJA_TYPE_FR, CajaFr)) -#define CAJA_IS_FR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CAJA_TYPE_FR)) - -typedef struct _CajaFr CajaFr; -typedef struct _CajaFrClass CajaFrClass; - -struct _CajaFr { - GObject __parent; -}; - -struct _CajaFrClass { - GObjectClass __parent; -}; - -GType caja_fr_get_type (void); -void caja_fr_register_type (GTypeModule *module); - -G_END_DECLS - -#endif /* CAJA_FILEROLLER_H */ diff --git a/caja/engrampa-module.c b/caja/engrampa-module.c new file mode 100644 index 0000000..0eabdef --- /dev/null +++ b/caja/engrampa-module.c @@ -0,0 +1,56 @@ +/* + * File-Roller + * + * Copyright (C) 2004 Free Software Foundation, Inc. + * + * This library 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. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Author: Paolo Bacchilega + * + */ + +#include +#include +#include +#include +#include "caja-engrampa.h" + + +void +caja_module_initialize (GTypeModule*module) +{ + caja_fr_register_type (module); + + bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +} + + +void +caja_module_shutdown (void) +{ +} + + +void +caja_module_list_types (const GType **types, + int *num_types) +{ + static GType type_list[1]; + + type_list[0] = CAJA_TYPE_FR; + *types = type_list; + *num_types = 1; +} diff --git a/caja/fileroller-module.c b/caja/fileroller-module.c deleted file mode 100644 index 3384a70..0000000 --- a/caja/fileroller-module.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * File-Roller - * - * Copyright (C) 2004 Free Software Foundation, Inc. - * - * This library 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. - * - * This library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Author: Paolo Bacchilega - * - */ - -#include -#include -#include -#include -#include "caja-fileroller.h" - - -void -caja_module_initialize (GTypeModule*module) -{ - caja_fr_register_type (module); - - bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -} - - -void -caja_module_shutdown (void) -{ -} - - -void -caja_module_list_types (const GType **types, - int *num_types) -{ - static GType type_list[1]; - - type_list[0] = CAJA_TYPE_FR; - *types = type_list; - *num_types = 1; -} -- cgit v1.2.1