GNOME.org
 

[gnome-main-menu] caja-main-menu: migrate code to caja from nautilus

commit c8669c65936b7a4c7945f0284d60558284378473
Author: Stefano Karapetsas <stefano karapetsas com>
Date:   Wed Dec 12 15:49:03 2012 +0100

    caja-main-menu: migrate code to caja from nautilus

 caja-main-menu/Makefile.am      |   18 ++++++------
 caja-main-menu/caja-main-menu.c |   56 +++++++++++++++++++-------------------
 caja-main-menu/caja-main-menu.h |   28 +++++++++---------
 caja-main-menu/main-menu.c      |   18 ++++++------
 4 files changed, 60 insertions(+), 60 deletions(-)
---
diff --git a/caja-main-menu/Makefile.am b/caja-main-menu/Makefile.am
index 7b85981..4b23789 100644
--- a/caja-main-menu/Makefile.am
+++ b/caja-main-menu/Makefile.am
@@ -1,22 +1,22 @@
 INCLUDES =						\
-	-DG_LOG_DOMAIN=\"Nautilus-Main-Menu\"		\
+	-DG_LOG_DOMAIN=\"Caja-Main-Menu\"		\
 	-DDATADIR=\"$(datadir)\"			\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
-	$(NAUTILUS_CFLAGS)				\
+	$(CAJA_CFLAGS)				\
 	$(WARN_CFLAGS)
 
-nautilus_extensiondir= NAUTILUSDIR@
+caja_extensiondir= CAJADIR@
 
-nautilus_extension_LTLIBRARIES=libnautilus-main-menu.la
+caja_extension_LTLIBRARIES=libcaja-main-menu.la
 
-libnautilus_main_menu_la_SOURCES = \
-	nautilus-main-menu.c       \
-	nautilus-main-menu.h       \
+libcaja_main_menu_la_SOURCES = \
+	caja-main-menu.c       \
+	caja-main-menu.h       \
 	main-menu.c
 
-libnautilus_main_menu_la_LDFLAGS = -module -avoid-version
-libnautilus_main_menu_la_LIBADD  = $(NAUTILUS_LIBS) $(GNOMEVFS_LIBS) $(GCONF_LIBS) $(GNOMEDESKTOP_LIBS)
+libcaja_main_menu_la_LDFLAGS = -module -avoid-version
+libcaja_main_menu_la_LIBADD  = $(CAJA_LIBS)
 
 AM_CPPFLAGS =							\
 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
diff --git a/caja-main-menu/caja-main-menu.c b/caja-main-menu/caja-main-menu.c
index ac684ba..e6cad96 100644
--- a/caja-main-menu/caja-main-menu.c
+++ b/caja-main-menu/caja-main-menu.c
@@ -1,5 +1,5 @@
 /*
- *  nautilus-main-menu.c
+ *  caja-main-menu.c
  * 
  *  Copyright (C) 2006 Novell, Inc.
  *
@@ -25,9 +25,9 @@
 #include <config.h>
 #endif
 
-#include "nautilus-main-menu.h"
+#include "caja-main-menu.h"
 
-#include <libnautilus-extension/nautilus-menu-provider.h>
+#include <libcaja-extension/caja-menu-provider.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
@@ -35,8 +35,8 @@
 #include <string.h> /* for strcmp */
 #include <unistd.h> /* for chdir */
 
-static void nautilus_main_menu_instance_init (NautilusMainMenu      *cvs);
-static void nautilus_main_menu_class_init    (NautilusMainMenuClass *class);
+static void caja_main_menu_instance_init (CajaMainMenu      *cvs);
+static void caja_main_menu_class_init    (CajaMainMenuClass *class);
 
 static GType menu_type = 0;
 
@@ -54,14 +54,14 @@ static const char * const document_blacklist [] =
 };
 
 static MenuFileInfo
-get_menu_file_info (NautilusFileInfo *file_info)
+get_menu_file_info (CajaFileInfo *file_info)
 {
 	MenuFileInfo  ret;
 	gchar            *mime_type;
 	
 	g_assert (file_info);
 
-	mime_type = nautilus_file_info_get_mime_type (file_info);
+	mime_type = caja_file_info_get_mime_type (file_info);
 	
 	if (strcmp (mime_type, "application/x-desktop") == 0) {
 		ret = FILE_INFO_LAUNCHER;
@@ -84,8 +84,8 @@ get_menu_file_info (NautilusFileInfo *file_info)
 }
 
 static void
-main_menu_callback (NautilusMenuItem *item,
-			NautilusFileInfo *file_info)
+main_menu_callback (CajaMenuItem *item,
+			CajaFileInfo *file_info)
 {
 	switch (get_menu_file_info (file_info)) {
 		case FILE_INFO_LAUNCHER:
@@ -102,10 +102,10 @@ main_menu_callback (NautilusMenuItem *item,
 	}
 }
 
-static NautilusMenuItem *
+static CajaMenuItem *
 main_menu_menu_item_new (MenuFileInfo  menu_file_info)
 {
-	NautilusMenuItem *ret;
+	CajaMenuItem *ret;
 	const char *name;
 	const char *tooltip;		
 
@@ -135,18 +135,18 @@ main_menu_menu_item_new (MenuFileInfo  menu_file_info)
 		g_assert_not_reached ();
 	}
 
-	ret = nautilus_menu_item_new ("NautilusMainMenu::main_menu",
+	ret = caja_menu_item_new ("CajaMainMenu::main_menu",
 				      name, tooltip, "gnome-fs-client");
 
 	return ret;
 }
 
 static GList *
-nautilus_main_menu_get_file_items (NautilusMenuProvider *provider,
+caja_main_menu_get_file_items (CajaMenuProvider *provider,
 				       GtkWidget            *window,
 				       GList                *files)
 {
-	NautilusMenuItem *item;
+	CajaMenuItem *item;
 	MenuFileInfo  menu_file_info;
 	GList *l;
 	
@@ -174,55 +174,55 @@ nautilus_main_menu_get_file_items (NautilusMenuProvider *provider,
 }
 
 static void
-nautilus_main_menu_menu_provider_iface_init (NautilusMenuProviderIface *iface)
+caja_main_menu_menu_provider_iface_init (CajaMenuProviderIface *iface)
 {
-	iface->get_file_items = nautilus_main_menu_get_file_items;
+	iface->get_file_items = caja_main_menu_get_file_items;
 }
 
-static void 
-nautilus_main_menu_instance_init (NautilusMainMenu *cvs)
+static void
+caja_main_menu_instance_init (CajaMainMenu *cvs)
 {
 }
 
 static void
-nautilus_main_menu_class_init (NautilusMainMenuClass *class)
+caja_main_menu_class_init (CajaMainMenuClass *class)
 {
 }
 
 GType
-nautilus_main_menu_get_type (void) 
+caja_main_menu_get_type (void) 
 {
 	return menu_type;
 }
 
 void
-nautilus_main_menu_register_type (GTypeModule *module)
+caja_main_menu_register_type (GTypeModule *module)
 {
 	static const GTypeInfo info = {
-		sizeof (NautilusMainMenuClass),
+		sizeof (CajaMainMenuClass),
 		(GBaseInitFunc) NULL,
 		(GBaseFinalizeFunc) NULL,
-		(GClassInitFunc) nautilus_main_menu_class_init,
+		(GClassInitFunc) caja_main_menu_class_init,
 		NULL, 
 		NULL,
-		sizeof (NautilusMainMenu),
+		sizeof (CajaMainMenu),
 		0,
-		(GInstanceInitFunc) nautilus_main_menu_instance_init,
+		(GInstanceInitFunc) caja_main_menu_instance_init,
 	};
 
 	static const GInterfaceInfo menu_provider_iface_info = {
-		(GInterfaceInitFunc) nautilus_main_menu_menu_provider_iface_init,
+		(GInterfaceInitFunc) caja_main_menu_menu_provider_iface_init,
 		NULL,
 		NULL
 	};
 
 	menu_type = g_type_module_register_type (module,
 						     G_TYPE_OBJECT,
-						     "NautilusMainMenu",
+						     "CajaMainMenu",
 						     &info, 0);
 
 	g_type_module_add_interface (module,
 				     menu_type,
-				     NAUTILUS_TYPE_MENU_PROVIDER,
+				     CAJA_TYPE_MENU_PROVIDER,
 				     &menu_provider_iface_info);
 }
diff --git a/caja-main-menu/caja-main-menu.h b/caja-main-menu/caja-main-menu.h
index ec55796..6a66c59 100644
--- a/caja-main-menu/caja-main-menu.h
+++ b/caja-main-menu/caja-main-menu.h
@@ -1,5 +1,5 @@
 /*
- *  nautilus-main-menu.h
+ *  caja-main-menu.h
  * 
  *  Copyright (C) 2004, 2005 Free Software Foundation, Inc.
  *
@@ -21,34 +21,34 @@
  * 
  */
 
-#ifndef NAUTILUS_MAIN_MENU_H
-#define NAUTILUS_MAIN_MENU_H
+#ifndef CAJA_MAIN_MENU_H
+#define CAJA_MAIN_MENU_H
 
 #include <glib-object.h>
 
 G_BEGIN_DECLS
 
 /* Declarations for the open terminal extension object.  This object will be
- * instantiated by nautilus.  It implements the GInterfaces 
- * exported by libnautilus. */
+ * instantiated by caja.  It implements the GInterfaces 
+ * exported by libcaja. */
 
 
-#define NAUTILUS_TYPE_MAIN_MENU	  (nautilus_main_menu_get_type ())
-#define NAUTILUS_MAIN_MENU(o)	  (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_MAIN_MENU, NautilusMainMenu))
-#define NAUTILUS_IS_MAIN_MENU(o)	  (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_MAIN_MENU))
-typedef struct _NautilusMainMenu      NautilusMainMenu;
-typedef struct _NautilusMainMenuClass NautilusMainMenuClass;
+#define CAJA_TYPE_MAIN_MENU	  (caja_main_menu_get_type ())
+#define CAJA_MAIN_MENU(o)	  (G_TYPE_CHECK_INSTANCE_CAST ((o), CAJA_TYPE_MAIN_MENU, CajaMainMenu))
+#define CAJA_IS_MAIN_MENU(o)	  (G_TYPE_CHECK_INSTANCE_TYPE ((o), CAJA_TYPE_MAIN_MENU))
+typedef struct _CajaMainMenu      CajaMainMenu;
+typedef struct _CajaMainMenuClass CajaMainMenuClass;
 
-struct _NautilusMainMenu {
+struct _CajaMainMenu {
 	GObject parent_slot;
 };
 
-struct _NautilusMainMenuClass {
+struct _CajaMainMenuClass {
 	GObjectClass parent_slot;
 };
 
-GType nautilus_main_menu_get_type      (void);
-void  nautilus_main_menu_register_type (GTypeModule *module);
+GType caja_main_menu_get_type      (void);
+void  caja_main_menu_register_type (GTypeModule *module);
 
 G_END_DECLS
 
diff --git a/caja-main-menu/main-menu.c b/caja-main-menu/main-menu.c
index 0d20db1..a308187 100644
--- a/caja-main-menu/main-menu.c
+++ b/caja-main-menu/main-menu.c
@@ -25,33 +25,33 @@
  #include <config.h>
 #endif
 
-#include "nautilus-main-menu.h"
+#include "caja-main-menu.h"
 
-#include <libnautilus-extension/nautilus-extension-types.h>
+#include <libcaja-extension/caja-extension-types.h>
 #include <libintl.h>
 
 static GType type_list[1];
 
 void
-nautilus_module_initialize (GTypeModule *module)
+caja_module_initialize (GTypeModule *module)
 {
-	g_print ("Initializing nautilus-main-menu extension\n");
+	g_print ("Initializing caja-main-menu extension\n");
 
-	nautilus_main_menu_register_type (module);
-	type_list[0] = NAUTILUS_TYPE_MAIN_MENU;
+	caja_main_menu_register_type (module);
+	type_list[0] = CAJA_TYPE_MAIN_MENU;
 
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 }
 
 void
-nautilus_module_shutdown (void)
+caja_module_shutdown (void)
 {
-	g_print ("Shutting down nautilus-main-menu extension\n");
+	g_print ("Shutting down caja-main-menu extension\n");
 }
 
 void 
-nautilus_module_list_types (const GType **types,
+caja_module_list_types (const GType **types,
 			    int          *num_types)
 {
 	*types = type_list;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]