brasero r1650 - in trunk: . nautilus



Author: philippr
Date: Wed Dec 17 20:51:53 2008
New Revision: 1650
URL: http://svn.gnome.org/viewvc/brasero?rev=1650&view=rev

Log:
	Make the plugin really side installable by changing the name of the 
	object which I had stupidly forgotten to do. (Must be backported)

	* nautilus/nautilus-burn-bar.c (nautilus_disc_burn_bar_get_button),
	(nautilus_disc_burn_bar_set_property),
	(nautilus_disc_burn_bar_get_property),
	(nautilus_disc_burn_bar_class_init), (button_clicked_cb),
	(nautilus_disc_burn_bar_init), (nautilus_disc_burn_bar_finalize),
	(nautilus_disc_burn_bar_new):
	* nautilus/nautilus-burn-bar.h:
	* nautilus/nautilus-burn-extension.c (launch_process),
	(nautilus_disc_burn_get_file_items),
	(nautilus_disc_burn_get_background_items),
	(nautilus_disc_burn_get_toolbar_items),
	(nautilus_disc_burn_menu_provider_iface_init), (bar_activated_cb),
	(destroyed_callback), (sense_widget),
	(nautilus_disc_burn_get_location_widget),
	(nautilus_disc_burn_location_widget_provider_iface_init),
	(update_widget_sensitivity), (update_empty_idle),
	(queue_update_empty), (burn_monitor_cb), (start_monitor),
	(nautilus_disc_burn_instance_init), (nautilus_disc_burn_finalize),
	(nautilus_disc_burn_class_init), (nautilus_disc_burn_get_type),
	(nautilus_disc_burn_register_type), (nautilus_module_initialize):


Modified:
   trunk/ChangeLog
   trunk/nautilus/nautilus-burn-bar.c
   trunk/nautilus/nautilus-burn-bar.h
   trunk/nautilus/nautilus-burn-extension.c

Modified: trunk/nautilus/nautilus-burn-bar.c
==============================================================================
--- trunk/nautilus/nautilus-burn-bar.c	(original)
+++ trunk/nautilus/nautilus-burn-bar.c	Wed Dec 17 20:51:53 2008
@@ -29,11 +29,11 @@
 
 #include "nautilus-burn-bar.h"
 
-static void nautilus_burn_bar_finalize   (GObject *object);
+static void nautilus_disc_burn_bar_finalize   (GObject *object);
 
-#define NAUTILUS_BURN_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_BURN_BAR, NautilusBurnBarPrivate))
+#define NAUTILUS_DISC_BURN_BAR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_DISC_BURN_BAR, NautilusDiscBurnBarPrivate))
 
-struct NautilusBurnBarPrivate
+struct NautilusDiscBurnBarPrivate
 {
         GtkWidget   *button;
 };
@@ -45,10 +45,10 @@
 
 static guint           signals [LAST_SIGNAL] = { 0, };
 
-G_DEFINE_TYPE (NautilusBurnBar, nautilus_burn_bar, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (NautilusDiscBurnBar, nautilus_disc_burn_bar, GTK_TYPE_HBOX)
 
 GtkWidget *
-nautilus_burn_bar_get_button (NautilusBurnBar *bar)
+nautilus_disc_burn_bar_get_button (NautilusDiscBurnBar *bar)
 {
         GtkWidget *button;
 
@@ -60,14 +60,14 @@
 }
 
 static void
-nautilus_burn_bar_set_property (GObject            *object,
+nautilus_disc_burn_bar_set_property (GObject            *object,
                                 guint               prop_id,
                                 const GValue       *value,
                                 GParamSpec         *pspec)
 {
-        NautilusBurnBar *self;
+        NautilusDiscBurnBar *self;
 
-        self = NAUTILUS_BURN_BAR (object);
+        self = NAUTILUS_DISC_BURN_BAR (object);
 
         switch (prop_id) {
         default:
@@ -77,14 +77,14 @@
 }
 
 static void
-nautilus_burn_bar_get_property (GObject    *object,
+nautilus_disc_burn_bar_get_property (GObject    *object,
                                 guint       prop_id,
                                 GValue     *value,
                                 GParamSpec *pspec)
 {
-        NautilusBurnBar *self;
+        NautilusDiscBurnBar *self;
 
-        self = NAUTILUS_BURN_BAR (object);
+        self = NAUTILUS_DISC_BURN_BAR (object);
 
         switch (prop_id) {
         default:
@@ -94,20 +94,20 @@
 }
 
 static void
-nautilus_burn_bar_class_init (NautilusBurnBarClass *klass)
+nautilus_disc_burn_bar_class_init (NautilusDiscBurnBarClass *klass)
 {
         GObjectClass   *object_class = G_OBJECT_CLASS (klass);
 
-        object_class->finalize     = nautilus_burn_bar_finalize;
-        object_class->get_property = nautilus_burn_bar_get_property;
-        object_class->set_property = nautilus_burn_bar_set_property;
+        object_class->finalize     = nautilus_disc_burn_bar_finalize;
+        object_class->get_property = nautilus_disc_burn_bar_get_property;
+        object_class->set_property = nautilus_disc_burn_bar_set_property;
 
-        g_type_class_add_private (klass, sizeof (NautilusBurnBarPrivate));
+        g_type_class_add_private (klass, sizeof (NautilusDiscBurnBarPrivate));
 
         signals [ACTIVATE] = g_signal_new ("activate",
                                            G_TYPE_FROM_CLASS (klass),
                                            G_SIGNAL_RUN_LAST,
-                                           G_STRUCT_OFFSET (NautilusBurnBarClass, activate),
+                                           G_STRUCT_OFFSET (NautilusDiscBurnBarClass, activate),
                                            NULL, NULL,
                                            g_cclosure_marshal_VOID__VOID,
                                            G_TYPE_NONE, 0);
@@ -116,18 +116,18 @@
 
 static void
 button_clicked_cb (GtkWidget       *button,
-                   NautilusBurnBar *bar)
+                   NautilusDiscBurnBar *bar)
 {
         g_signal_emit (bar, signals [ACTIVATE], 0);
 }
 
 static void
-nautilus_burn_bar_init (NautilusBurnBar *bar)
+nautilus_disc_burn_bar_init (NautilusDiscBurnBar *bar)
 {
         GtkWidget   *label;
         GtkWidget   *hbox;
 
-        bar->priv = NAUTILUS_BURN_BAR_GET_PRIVATE (bar);
+        bar->priv = NAUTILUS_DISC_BURN_BAR_GET_PRIVATE (bar);
 
         hbox = GTK_WIDGET (bar);
 
@@ -144,30 +144,29 @@
                           bar);
 
         gtk_widget_set_tooltip_text (bar->priv->button, _("Write contents to a CD or DVD disc"));
-
 }
 
 static void
-nautilus_burn_bar_finalize (GObject *object)
+nautilus_disc_burn_bar_finalize (GObject *object)
 {
-        NautilusBurnBar *bar;
+        NautilusDiscBurnBar *bar;
 
         g_return_if_fail (object != NULL);
-        g_return_if_fail (NAUTILUS_IS_BURN_BAR (object));
+        g_return_if_fail (NAUTILUS_IS_DISC_BURN_BAR (object));
 
-        bar = NAUTILUS_BURN_BAR (object);
+        bar = NAUTILUS_DISC_BURN_BAR (object);
 
         g_return_if_fail (bar->priv != NULL);
 
-        G_OBJECT_CLASS (nautilus_burn_bar_parent_class)->finalize (object);
+        G_OBJECT_CLASS (nautilus_disc_burn_bar_parent_class)->finalize (object);
 }
 
 GtkWidget *
-nautilus_burn_bar_new (void)
+nautilus_disc_burn_bar_new (void)
 {
         GObject *result;
 
-        result = g_object_new (NAUTILUS_TYPE_BURN_BAR,
+        result = g_object_new (NAUTILUS_TYPE_DISC_BURN_BAR,
                                NULL);
 
         return GTK_WIDGET (result);

Modified: trunk/nautilus/nautilus-burn-bar.h
==============================================================================
--- trunk/nautilus/nautilus-burn-bar.h	(original)
+++ trunk/nautilus/nautilus-burn-bar.h	Wed Dec 17 20:51:53 2008
@@ -27,34 +27,34 @@
 
 G_BEGIN_DECLS
 
-#define NAUTILUS_TYPE_BURN_BAR         (nautilus_burn_bar_get_type ())
-#define NAUTILUS_BURN_BAR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_BURN_BAR, NautilusBurnBar))
-#define NAUTILUS_BURN_BAR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_BURN_BAR, NautilusBurnBarClass))
-#define NAUTILUS_IS_BURN_BAR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_BURN_BAR))
-#define NAUTILUS_IS_BURN_BAR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_BURN_BAR))
-#define NAUTILUS_BURN_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_BURN_BAR, NautilusBurnBarClass))
+#define NAUTILUS_TYPE_DISC_BURN_BAR         (nautilus_disc_burn_bar_get_type ())
+#define NAUTILUS_DISC_BURN_BAR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_DISC_BURN_BAR, NautilusDiscBurnBar))
+#define NAUTILUS_DISC_BURN_BAR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), NAUTILUS_TYPE_DISC_BURN_BAR, NautilusDiscBurnBarClass))
+#define NAUTILUS_IS_DISC_BURN_BAR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_DISC_BURN_BAR))
+#define NAUTILUS_IS_DISC_BURN_BAR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NAUTILUS_TYPE_DISC_BURN_BAR))
+#define NAUTILUS_DISC_BURN_BAR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NAUTILUS_TYPE_DISC_BURN_BAR, NautilusDiscBurnBarClass))
 
-typedef struct NautilusBurnBarPrivate NautilusBurnBarPrivate;
+typedef struct NautilusDiscBurnBarPrivate NautilusDiscBurnBarPrivate;
 
 typedef struct
 {
         GtkHBox                 box;
 
-        NautilusBurnBarPrivate *priv;
-} NautilusBurnBar;
+        NautilusDiscBurnBarPrivate *priv;
+} NautilusDiscBurnBar;
 
 typedef struct
 {
         GtkHBoxClass            parent_class;
 
-	void (* activate) (NautilusBurnBar *bar);
+	void (* activate) (NautilusDiscBurnBar *bar);
 
-} NautilusBurnBarClass;
+} NautilusDiscBurnBarClass;
 
-GType       nautilus_burn_bar_get_type          (void);
-GtkWidget  *nautilus_burn_bar_new               (void);
+GType       nautilus_disc_burn_bar_get_type          (void);
+GtkWidget  *nautilus_disc_burn_bar_new               (void);
 
-GtkWidget  *nautilus_burn_bar_get_button        (NautilusBurnBar *bar);
+GtkWidget  *nautilus_disc_burn_bar_get_button        (NautilusDiscBurnBar *bar);
 
 G_END_DECLS
 

Modified: trunk/nautilus/nautilus-burn-extension.c
==============================================================================
--- trunk/nautilus/nautilus-burn-extension.c	(original)
+++ trunk/nautilus/nautilus-burn-extension.c	Wed Dec 17 20:51:53 2008
@@ -36,26 +36,26 @@
 
 #define BURN_URI "burn:///"
 
-#define NAUTILUS_TYPE_BURN  (nautilus_burn_get_type ())
-#define NAUTILUS_BURN(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_BURN, NautilusBurn))
+#define NAUTILUS_TYPE_BURN  (nautilus_disc_burn_get_type ())
+#define NAUTILUS_DISC_BURN(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), NAUTILUS_TYPE_BURN, NautilusDiscBurn))
 #define NAUTILUS_IS_BURN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), NAUTILUS_TYPE_BURN))
 
-typedef struct _NautilusBurnPrivate NautilusBurnPrivate;
+typedef struct _NautilusDiscBurnPrivate NautilusDiscBurnPrivate;
 
 typedef struct
 {
         GObject              parent_slot;
-        NautilusBurnPrivate *priv;
-} NautilusBurn;
+        NautilusDiscBurnPrivate *priv;
+} NautilusDiscBurn;
 
 typedef struct
 {
         GObjectClass parent_slot;
-} NautilusBurnClass;
+} NautilusDiscBurnClass;
 
-#define NAUTILUS_BURN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_BURN, NautilusBurnPrivate))
+#define NAUTILUS_DISC_BURN_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAUTILUS_TYPE_BURN, NautilusDiscBurnPrivate))
 
-struct _NautilusBurnPrivate
+struct _NautilusDiscBurnPrivate
 {
         GFileMonitor *burn_monitor;
         guint         empty : 1;
@@ -66,8 +66,8 @@
         GSList       *widget_list;
 };
 
-static GType nautilus_burn_get_type      (void);
-static void  nautilus_burn_register_type (GTypeModule *module);
+static GType nautilus_disc_burn_get_type      (void);
+static void  nautilus_disc_burn_register_type (GTypeModule *module);
 
 static GObjectClass *parent_class;
 
@@ -128,7 +128,7 @@
                             NULL,
                             &error)) {
 
-                dialog = gtk_message_dialog_new (NULL,
+                dialog = gtk_message_dialog_new (parent,
                                                  GTK_DIALOG_MODAL,
                                                  GTK_MESSAGE_WARNING,
                                                  GTK_BUTTONS_OK,
@@ -413,9 +413,9 @@
 }
 
 static GList *
-nautilus_burn_get_file_items (NautilusMenuProvider *provider,
-                              GtkWidget            *window,
-                              GList                *selection)
+nautilus_disc_burn_get_file_items (NautilusMenuProvider *provider,
+                                   GtkWidget            *window,
+                                   GList                *selection)
 {
         GList            *items = NULL;
         NautilusMenuItem *item;
@@ -461,7 +461,7 @@
 
         if (is_iso) {
                 /* Whether or not this file is local is not a problem */
-                item = nautilus_menu_item_new ("NautilusBurn::write_iso",
+                item = nautilus_menu_item_new ("NautilusDiscBurn::write_iso",
                                                _("_Write to Disc..."),
                                                _("Write disc image to a CD or DVD disc"),
                                                "brasero");
@@ -514,7 +514,7 @@
                 device_path = g_volume_get_identifier (volume, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
 
                 /* user may want to copy it ... */
-                item = nautilus_menu_item_new ("NautilusBurn::copy_disc",
+                item = nautilus_menu_item_new ("NautilusDiscBurn::copy_disc",
                                                _("_Copy Disc..."),
                                                _("Create a copy of this CD or DVD disc"),
                                                "brasero");
@@ -526,7 +526,7 @@
                 items = g_list_append (items, item);
 
                 /* ... or if it's a rewritable medium to blank it ... */
-                item = nautilus_menu_item_new ("NautilusBurn::blank_disc",
+                item = nautilus_menu_item_new ("NautilusDiscBurn::blank_disc",
                                                _("_Blank Disc..."),
                                                _("Blank this CD or DVD disc"),
                                                "brasero");
@@ -538,7 +538,7 @@
                 items = g_list_append (items, item);
 
                 /* ... or verify medium. */
-                item = nautilus_menu_item_new ("NautilusBurn::check_disc",
+                item = nautilus_menu_item_new ("NautilusDiscBurn::check_disc",
                                                _("_Check Disc..."),
                                                _("Check the data integrity on this CD or DVD disc"),
                                                "brasero");
@@ -565,9 +565,9 @@
 }
 
 static GList *
-nautilus_burn_get_background_items (NautilusMenuProvider *provider,
-                                    GtkWidget            *window,
-                                    NautilusFileInfo     *current_folder)
+nautilus_disc_burn_get_background_items (NautilusMenuProvider *provider,
+                                         GtkWidget            *window,
+                                         NautilusFileInfo     *current_folder)
 {
         GList *items;
         char  *scheme;
@@ -579,7 +579,7 @@
         if (strcmp (scheme, "burn") == 0) {
                 NautilusMenuItem *item;
 
-                item = nautilus_menu_item_new ("NautilusBurn::write_menu",
+                item = nautilus_menu_item_new ("NautilusDiscBurn::write_menu",
                                                _("_Write to Disc..."),
                                                _("Write contents to a CD or DVD disc"),
                                                "brasero");
@@ -587,7 +587,7 @@
                                   G_CALLBACK (write_activate_cb), window);
                 items = g_list_append (items, item);
 
-                g_object_set (item, "sensitive", ! NAUTILUS_BURN (provider)->priv->empty, NULL);
+                g_object_set (item, "sensitive", ! NAUTILUS_DISC_BURN (provider)->priv->empty, NULL);
         }
 
         g_free (scheme);
@@ -596,9 +596,9 @@
 }
 
 static GList *
-nautilus_burn_get_toolbar_items (NautilusMenuProvider *provider,
-                                 GtkWidget            *window,
-                                 NautilusFileInfo     *current_folder)
+nautilus_disc_burn_get_toolbar_items (NautilusMenuProvider *provider,
+                                      GtkWidget            *window,
+                                      NautilusFileInfo     *current_folder)
 {
         GList *items;
 
@@ -608,15 +608,15 @@
 }
 
 static void
-nautilus_burn_menu_provider_iface_init (NautilusMenuProviderIface *iface)
+nautilus_disc_burn_menu_provider_iface_init (NautilusMenuProviderIface *iface)
 {
-        iface->get_file_items = nautilus_burn_get_file_items;
-        iface->get_background_items = nautilus_burn_get_background_items;
-        iface->get_toolbar_items = nautilus_burn_get_toolbar_items;
+        iface->get_file_items = nautilus_disc_burn_get_file_items;
+        iface->get_background_items = nautilus_disc_burn_get_background_items;
+        iface->get_toolbar_items = nautilus_disc_burn_get_toolbar_items;
 }
 
 static void
-bar_activated_cb (NautilusBurnBar *bar,
+bar_activated_cb (NautilusDiscBurnBar *bar,
                   gpointer         data)
 {
         launch_brasero_on_window (GTK_WINDOW (data));
@@ -672,13 +672,13 @@
 
 static void
 destroyed_callback (GtkWidget    *widget,
-                    NautilusBurn *burn)
+                    NautilusDiscBurn *burn)
 {
         burn->priv->widget_list = g_slist_remove (burn->priv->widget_list, widget);
 }
 
 static void
-sense_widget (NautilusBurn *burn,
+sense_widget (NautilusDiscBurn *burn,
               GtkWidget    *widget)
 {
         gtk_widget_set_sensitive (widget, !burn->priv->empty);
@@ -691,21 +691,21 @@
 }
 
 static GtkWidget *
-nautilus_burn_get_location_widget (NautilusLocationWidgetProvider *iface,
-                                   const char                     *uri,
-                                   GtkWidget                      *window)
+nautilus_disc_burn_get_location_widget (NautilusLocationWidgetProvider *iface,
+                                        const char                     *uri,
+                                        GtkWidget                      *window)
 {
         if (g_str_has_prefix (uri, "burn:")) {
                 GtkWidget    *bar;
-                NautilusBurn *burn;
+                NautilusDiscBurn *burn;
 
                 DEBUG_PRINT ("Get location widget for burn\n");
 
-                burn = NAUTILUS_BURN (iface);
+                burn = NAUTILUS_DISC_BURN (iface);
 
-                bar = nautilus_burn_bar_new ();
+                bar = nautilus_disc_burn_bar_new ();
 
-                sense_widget (burn, nautilus_burn_bar_get_button (NAUTILUS_BURN_BAR (bar)));
+                sense_widget (burn, nautilus_disc_burn_bar_get_button (NAUTILUS_DISC_BURN_BAR (bar)));
 
                 g_signal_connect (bar, "activate",
                                   G_CALLBACK (bar_activated_cb),
@@ -720,20 +720,20 @@
 }
 
 static void
-nautilus_burn_location_widget_provider_iface_init (NautilusLocationWidgetProviderIface *iface)
+nautilus_disc_burn_location_widget_provider_iface_init (NautilusLocationWidgetProviderIface *iface)
 {
-        iface->get_widget = nautilus_burn_get_location_widget;
+        iface->get_widget = nautilus_disc_burn_get_location_widget;
 }
 
 static void
 update_widget_sensitivity (GtkWidget    *widget,
-                           NautilusBurn *burn)
+                           NautilusDiscBurn *burn)
 {
         gtk_widget_set_sensitive (widget, !burn->priv->empty);
 }
 
 static gboolean
-update_empty_idle (NautilusBurn *burn)
+update_empty_idle (NautilusDiscBurn *burn)
 {
         gboolean is_empty;
 
@@ -756,7 +756,7 @@
 }
 
 static void
-queue_update_empty (NautilusBurn *burn)
+queue_update_empty (NautilusDiscBurn *burn)
 {
         if (burn->priv->empty_update_id != 0) {
                 g_source_remove (burn->priv->empty_update_id);
@@ -770,7 +770,7 @@
                  GFile            *file,
                  GFile            *other_file,
                  GFileMonitorEvent event_type,
-                 NautilusBurn     *burn)
+                 NautilusDiscBurn     *burn)
 {
         DEBUG_PRINT ("Monitor callback type %d\n", event_type);
 
@@ -787,7 +787,7 @@
 }
 
 static gboolean
-start_monitor (NautilusBurn *burn)
+start_monitor (NautilusDiscBurn *burn)
 {
         GFile  *file;
         GError *error;
@@ -824,9 +824,9 @@
 }
 
 static void
-nautilus_burn_instance_init (NautilusBurn *burn)
+nautilus_disc_burn_instance_init (NautilusDiscBurn *burn)
 {
-        burn->priv = NAUTILUS_BURN_GET_PRIVATE (burn);
+        burn->priv = NAUTILUS_DISC_BURN_GET_PRIVATE (burn);
 
 #ifdef DEBUG_ENABLE
         debug_init ();
@@ -838,16 +838,16 @@
 }
 
 static void
-nautilus_burn_finalize (GObject *object)
+nautilus_disc_burn_finalize (GObject *object)
 {
-        NautilusBurn *burn;
+        NautilusDiscBurn *burn;
 
         g_return_if_fail (object != NULL);
         g_return_if_fail (NAUTILUS_IS_BURN (object));
 
         DEBUG_PRINT ("Finalizing burn extension\n");
 
-        burn = NAUTILUS_BURN (object);
+        burn = NAUTILUS_DISC_BURN (object);
 
         g_return_if_fail (burn->priv != NULL);
 
@@ -871,54 +871,54 @@
 }
 
 static void
-nautilus_burn_class_init (NautilusBurnClass *klass)
+nautilus_disc_burn_class_init (NautilusDiscBurnClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
         parent_class = g_type_class_peek_parent (klass);
 
-        object_class->finalize = nautilus_burn_finalize;
+        object_class->finalize = nautilus_disc_burn_finalize;
 
-        g_type_class_add_private (klass, sizeof (NautilusBurnPrivate));
+        g_type_class_add_private (klass, sizeof (NautilusDiscBurnPrivate));
 }
 
 static GType burn_type = 0;
 
 static GType
-nautilus_burn_get_type (void)
+nautilus_disc_burn_get_type (void)
 {
         return burn_type;
 }
 
 static void
-nautilus_burn_register_type (GTypeModule *module)
+nautilus_disc_burn_register_type (GTypeModule *module)
 {
         static const GTypeInfo info = {
-                sizeof (NautilusBurnClass),
+                sizeof (NautilusDiscBurnClass),
                 (GBaseInitFunc) NULL,
                 (GBaseFinalizeFunc) NULL,
-                (GClassInitFunc) nautilus_burn_class_init,
+                (GClassInitFunc) nautilus_disc_burn_class_init,
                 NULL,
                 NULL,
-                sizeof (NautilusBurn),
+                sizeof (NautilusDiscBurn),
                 0,
-                (GInstanceInitFunc) nautilus_burn_instance_init,
+                (GInstanceInitFunc) nautilus_disc_burn_instance_init,
         };
 
         static const GInterfaceInfo menu_provider_iface_info = {
-                (GInterfaceInitFunc) nautilus_burn_menu_provider_iface_init,
+                (GInterfaceInitFunc) nautilus_disc_burn_menu_provider_iface_init,
                 NULL,
                 NULL
         };
         static const GInterfaceInfo location_widget_provider_iface_info = {
-                (GInterfaceInitFunc) nautilus_burn_location_widget_provider_iface_init,
+                (GInterfaceInitFunc) nautilus_disc_burn_location_widget_provider_iface_init,
                 NULL,
                 NULL
         };
 
         burn_type = g_type_module_register_type (module,
                                                  G_TYPE_OBJECT,
-                                                 "NautilusBurn",
+                                                 "NautilusDiscBurn",
                                                  &info, 0);
 
         g_type_module_add_interface (module,
@@ -934,7 +934,7 @@
 void
 nautilus_module_initialize (GTypeModule *module)
 {
-        nautilus_burn_register_type (module);
+        nautilus_disc_burn_register_type (module);
         bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]