Merge authors: Ted Gould (ted) Related merge proposals: https://code.launchpad.net/~ted/dbusmenu/enums-the-rightdir/+merge/52204 proposed by: Ted Gould (ted) review: Approve - Conor Curran (cjcurran) ------------------------------------------------------------ revno: 256 [merge] committer: Ted Gould <[email protected]> branch nick: trunk timestamp: Fri 2011-03-04 09:33:17 -0600 message: Fix the enum templates modified: libdbusmenu-glib/enum-types.c.in libdbusmenu-glib/enum-types.h.in
-- lp:dbusmenu https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk Your team ayatana-commits is subscribed to branch lp:dbusmenu. To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription
=== modified file 'libdbusmenu-glib/enum-types.c.in' --- libdbusmenu-glib/enum-types.c.in 2011-02-18 18:48:23 +0000 +++ libdbusmenu-glib/enum-types.c.in 2011-03-04 15:01:20 +0000 @@ -31,7 +31,7 @@ /*** END file-header ***/ /*** BEGIN file-production ***/ -#include "@filename@" +#include "@basename@" /*** END file-production ***/ /*** BEGIN value-header ***/ === modified file 'libdbusmenu-glib/enum-types.h.in' --- libdbusmenu-glib/enum-types.h.in 2011-02-24 15:38:18 +0000 +++ libdbusmenu-glib/enum-types.h.in 2011-03-04 15:01:20 +0000 @@ -44,13 +44,16 @@ /*** BEGIN file-production ***/ /* Enumerations from file: "@filename@" */ -#include "@filename@" +#include "@basename@" + /*** END file-production ***/ /*** BEGIN value-header ***/ + GType @enum_name@_get_type (void) G_GNUC_CONST; const gchar * @enum_name@_get_nick (@EnumName@ value) G_GNUC_CONST; @EnumName@ @enum_name@_get_value_from_nick (const gchar * nick) G_GNUC_CONST; + /** DBUSMENU_TYPE_@ENUMSHORT@:
_______________________________________________ Mailing list: https://launchpad.net/~ayatana-commits Post to : [email protected] Unsubscribe : https://launchpad.net/~ayatana-commits More help : https://help.launchpad.net/ListHelp
