Commit 6b6368db authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Return from get_type() functions is GType, not guint. Deal with errant

Mon Nov 26 20:34:52 2001  Owen Taylor  <otaylor@redhat.com>
        * libnautilus-private/nautilus-icon-factory.c:
        * libnautilus-private/nautilus-icon-container.h
          libnautilus-private/nautilus-file-operations-progress.h: Return
        from get_type() functions is GType, not guint.
        * components/sample/nautilus-sample-content-view.c
          libnautilus/nautilus-undo-private.h: Deal with
        errant gobject/* includes. (George Karabin)
parent 7e6e6bd8
Mon Nov 26 20:34:52 2001 Owen Taylor <otaylor@redhat.com>
* libnautilus-private/nautilus-icon-factory.c:
* libnautilus-private/nautilus-icon-container.h
libnautilus-private/nautilus-file-operations-progress.h: Return
from get_type() functions is GType, not guint.
* components/sample/nautilus-sample-content-view.c
libnautilus/nautilus-undo-private.h: Deal with
errant gobject/* includes. (George Karabin)
2001-11-22 Michael Meeks <michael@ximian.com>
* components/notes/nautilus-notes.c (make_notes_view):
......
......@@ -36,7 +36,6 @@
#include "nautilus-sample-content-view.h"
#include <bonobo/bonobo-i18n.h>
#include <gobject/gsignal.h>
#include <gtk/gtklabel.h>
#include <libgnome/gnome-macros.h>
#include <string.h>
......
......@@ -49,7 +49,7 @@ typedef struct {
#define NAUTILUS_IS_FILE_OPERATIONS_PROGRESS(obj) \
GTK_CHECK_TYPE (obj, nautilus_file_operations_progress_get_type ())
guint nautilus_file_operations_progress_get_type (void);
GType nautilus_file_operations_progress_get_type (void);
NautilusFileOperationsProgress *nautilus_file_operations_progress_new (const char *title,
const char *operation_string,
const char *from_prefix,
......
......@@ -152,7 +152,7 @@ typedef struct {
} NautilusIconContainerClass;
/* GtkObject */
guint nautilus_icon_container_get_type (void);
GType nautilus_icon_container_get_type (void);
GtkWidget * nautilus_icon_container_new (void);
......
......@@ -228,7 +228,7 @@ static int cached_thumbnail_limit;
/* forward declarations */
static guint nautilus_icon_factory_get_type (void);
static GType nautilus_icon_factory_get_type (void);
static void nautilus_icon_factory_class_init (NautilusIconFactoryClass *class);
static void nautilus_icon_factory_init (NautilusIconFactory *factory);
static void nautilus_icon_factory_destroy (GtkObject *object);
......
......@@ -26,7 +26,7 @@
#define NAUTILUS_UNDO_PRIVATE_H
#include <libnautilus/nautilus-distributed-undo.h>
#include <gobject/gobject.h>
#include <glib-object.h>
Nautilus_Undo_Manager nautilus_undo_get_undo_manager (GObject *attached_object);
void nautilus_undo_attach_undo_manager (GObject *object,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment