diff options
| author | Elliot Lee <sopwith@src.gnome.org> | 2000-01-18 19:21:16 +0000 |
|---|---|---|
| committer | Elliot Lee <sopwith@src.gnome.org> | 2000-01-18 19:21:16 +0000 |
| commit | b591e4c50a728234c96e3dc415d1b6f04f63cf57 (patch) | |
| tree | d3451a67a60e2205e2c19d33d3f0657b1eebea2c /libnautilus-extensions/nautilus-gtk-macros.h | |
| parent | 7e292ac0048804f96845aa930d584dc24ed90d38 (diff) | |
| download | nautilus-b591e4c50a728234c96e3dc415d1b6f04f63cf57.tar.gz | |
Since the prototypes for GtkObjectInitFunc and GtkClassInitFunc just have
* libnautilus/nautilus-gtk-macros.h: Since the prototypes for
GtkObjectInitFunc and GtkClassInitFunc just have a 'gpointer' for the args,
cast the given values to these function types, so that people can use the actual
pointer types as arguments without receiving a warning.
* src/ntl-index-panel.c: Change to match. Also set
object_klass->destroy & object_klass->finalize to point to our
implementation. Also remove unused variables
(nautilus_index_panel_initialize,
nautilus_index_panel_set_up_label).
* libnautilus/nautilus-background.c, src/ntl-window-msgs.c,
src/ntl-window.c, src/file-manager/fm-directory-icons.c: Remove
unused variables.
* src/ntl-window.h: Add a variable (unused) for future handling of content view loading.
* libnautilus/libnautilus.h: Add an interim g_alloca.
* libnautilus/nautilus-directory.c: Clean up a bit further, by
removing the need for another if(), and using g_alloca instead of
g_malloc.
Diffstat (limited to 'libnautilus-extensions/nautilus-gtk-macros.h')
| -rw-r--r-- | libnautilus-extensions/nautilus-gtk-macros.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnautilus-extensions/nautilus-gtk-macros.h b/libnautilus-extensions/nautilus-gtk-macros.h index 0c9ed4365..8851fca18 100644 --- a/libnautilus-extensions/nautilus-gtk-macros.h +++ b/libnautilus-extensions/nautilus-gtk-macros.h @@ -47,8 +47,8 @@ class_name_in_function_format##_get_type (void) \ #class_name, \ sizeof (class_name), \ sizeof (class_name##Class), \ - class_name_in_function_format##_initialize_class, \ - class_name_in_function_format##_initialize, \ + (GtkClassInitFunc)class_name_in_function_format##_initialize_class, \ + (GtkObjectInitFunc)class_name_in_function_format##_initialize, \ NULL, \ NULL, \ NULL \ |