diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-28 14:08:09 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:49 +0200 |
| commit | 628b15b81b856d42bf00339d317cdcdc3200bbc4 (patch) | |
| tree | 2085c3cb6017e048cb09212cef6bbe593d34f82d /eel/eel-wrap-table.c | |
| parent | 09766159b53c812ddf55485511cdca457d89d80d (diff) | |
| download | caja-628b15b81b856d42bf00339d317cdcdc3200bbc4.tar.bz2 caja-628b15b81b856d42bf00339d317cdcdc3200bbc4.tar.xz | |
[eel] simplify build system
Note:
remove eel-types.h include in eel-wrap-table.c (which was removed
upstream prior, along with eel-image-table.[ch], after removal of
emblems/background-setting stuff, which we're not doing, yet).
So change EEL_TYPE_JUSTIFICATION to GTK_TYPE_JUSTIFICATION, and
EEL_JUSTIFICATION_BEGINNING to GTK_JUSTIFY_LEFT.
Upstream commit/message:
We don't need the enumtypes anymore, and the marshallers can easily be
autogenerated.
http://git.gnome.org/browse/nautilus/commit/?id=75a03a440ebff23ccbf8674ca4a0e9f6475ebbb8
Diffstat (limited to 'eel/eel-wrap-table.c')
| -rw-r--r-- | eel/eel-wrap-table.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/eel/eel-wrap-table.c b/eel/eel-wrap-table.c index 36c6c718..794e1c72 100644 --- a/eel/eel-wrap-table.c +++ b/eel/eel-wrap-table.c @@ -29,7 +29,6 @@ #include "eel-art-gtk-extensions.h" #include "eel-gtk-extensions.h" #include "eel-gtk-macros.h" -#include "eel-types.h" #include <gtk/gtk.h> /* Arguments */ @@ -135,9 +134,6 @@ eel_wrap_table_class_init (EelWrapTableClass *wrap_table_class) container_class->forall = eel_wrap_table_forall; container_class->child_type = eel_wrap_table_child_type; - /* Register some the enum types we need */ - eel_type_init (); - /* Arguments */ g_object_class_install_property (gobject_class, @@ -155,16 +151,16 @@ eel_wrap_table_class_init (EelWrapTableClass *wrap_table_class) (gobject_class, PROP_X_JUSTIFICATION, g_param_spec_enum ("x_justification", NULL, NULL, - EEL_TYPE_JUSTIFICATION, - EEL_JUSTIFICATION_BEGINNING, + GTK_TYPE_JUSTIFICATION, + GTK_JUSTIFY_LEFT, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_Y_JUSTIFICATION, g_param_spec_enum ("y_justification", NULL, NULL, - EEL_TYPE_JUSTIFICATION, - EEL_JUSTIFICATION_BEGINNING, + GTK_TYPE_JUSTIFICATION, + GTK_JUSTIFY_LEFT, G_PARAM_READWRITE)); g_object_class_install_property |