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-types.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-types.c')
-rw-r--r-- | eel/eel-types.c | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/eel/eel-types.c b/eel/eel-types.c deleted file mode 100644 index 4b5ae176..00000000 --- a/eel/eel-types.c +++ /dev/null @@ -1,82 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* eel-types.h - - - Copyright (C) 2000 Eazel, Inc. - - The Mate Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Mate Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Mate Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301, USA. - - Authors: Maciej Stachowiak <[email protected]> -*/ - - -#include <config.h> -#include <gtk/gtk.h> - -#define EEL_COMPILATION 1 -#include <eel/eel.h> - -#include "eel-type-builtins-vars.c" -#include "eel-type-builtins-evals.c" - -void -eel_type_init (void) -{ - int i; - GType type_id; - static gboolean initialized = FALSE; - - static struct - { - const gchar *type_name; - GType *type_id; - GType parent; - gconstpointer pointer1; - gpointer pointer2; - } builtin_info[EEL_TYPE_N_BUILTINS] = - { -#include "eel-type-builtins-ids.c" - }; - - if (initialized) - { - return; - } - initialized = TRUE; - - for (i = 0; i < EEL_TYPE_N_BUILTINS; i++) - { - type_id = G_TYPE_INVALID; - - if (builtin_info[i].parent == G_TYPE_ENUM) - { - type_id = g_enum_register_static (builtin_info[i].type_name, - builtin_info[i].pointer1); - } - else if (builtin_info[i].parent == G_TYPE_FLAGS) - { - type_id = g_flags_register_static (builtin_info[i].type_name, - builtin_info[i].pointer1); - } - else - { - g_assert_not_reached (); - } - - g_assert (type_id != G_TYPE_INVALID); - *builtin_info[i].type_id = type_id; - } -} - |