Index: configure.in.in =================================================================== --- configure.in.in (revision 26001) +++ configure.in.in (working copy) @@ -7,7 +7,7 @@ dnl *************************** dnl *** Version information *** dnl *************************** -m4_define([libxfcegui4_verinfo], [6:4:2]) +m4_define([libxfcegui4_verinfo], [7:0:0]) m4_define([libxfcegui4_version_major], [4]) m4_define([libxfcegui4_version_minor], [5]) m4_define([libxfcegui4_version_micro], [1]) @@ -128,7 +128,7 @@ dnl *** Check for gtk-doc *** dnl ************************* GTK_DOC_CHECK([1.0]) - + dnl *********************************** dnl *** Check for debugging support *** dnl *********************************** Index: libxfcegui4/xfce-internals.h =================================================================== --- libxfcegui4/xfce-internals.h (revision 26001) +++ libxfcegui4/xfce-internals.h (working copy) @@ -23,7 +23,8 @@ #ifndef __XFCE_INTERNALS_H__ #define __XFCE_INTERNALS_H__ -#include +#include +#include void _xfce_i18n_init (void); Index: libxfcegui4/libxfcegui4.h =================================================================== --- libxfcegui4/libxfcegui4.h (revision 26001) +++ libxfcegui4/libxfcegui4.h (working copy) @@ -28,13 +28,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include Index: libxfcegui4/Makefile.am =================================================================== --- libxfcegui4/Makefile.am (revision 26001) +++ libxfcegui4/Makefile.am (working copy) @@ -12,28 +12,6 @@ lib_LTLIBRARIES = \ libxfcegui4.la -netk_headers = \ - netk-application.h \ - netk-class-group.h \ - netk-screen.h \ - netk-util.h \ - netk-window.h \ - netk-window-menu.h \ - netk-window-action-menu.h \ - netk-workspace.h \ - netk-pager.h \ - netk-tasklist.h \ - netk-trayicon.h - -netk_built_headers = \ - netk-enum-types.h \ - netk-marshal.h - -netk_built_sources = \ - $(netk_built_headers) \ - netk-enum-types.c \ - netk-marshal.c - gui_built_headers = \ gui-enum-types.h @@ -44,7 +22,6 @@ gui_headers = \ icons.h \ xfce_aboutdialog.h \ - xfce_clock.h \ xfce_movehandler.h \ xfce_decorbutton.h \ xfce_decortoggle.h \ @@ -71,7 +48,6 @@ libxfcegui4includedir = $(includedir)/xfce4/libxfcegui4 libxfcegui4include_HEADERS = \ $(gui_headers) \ - libnetk.h \ libxfcegui4.h \ libxfcegui4-config.h \ dialogs.h \ @@ -79,14 +55,10 @@ preview_filesel.h \ xinerama.h \ xfce-startup-notification.h \ - $(netk_headers) \ - $(netk_built_headers) \ $(gui_built_headers) libxfcegui4_la_SOURCES = \ - $(netk_built_sources) \ $(gui_built_sources) \ - libnetk.h \ libxfcegui4.h \ libxfcegui4-config.h \ dialogs.c \ @@ -95,8 +67,6 @@ icons.h \ xfce_aboutdialog.c \ xfce_aboutdialog.h \ - xfce_clock.c \ - xfce_clock.h \ xfce_movehandler.c \ xfce_movehandler.h \ xfce_decorbutton.c \ @@ -123,22 +93,6 @@ gtk_style.h \ gtktoxevent.c \ gtktoxevent.h \ - netk-application.c \ - netk-class-group.c \ - netk-inlinepixbufs.h \ - netk-pager.c \ - netk-private.h \ - netk-screen.c \ - netk-tasklist.c \ - netk-trayicon.c \ - netk-util.c \ - netk-window.c \ - netk-window-menu.c \ - netk-window-menu.h \ - netk-window-action-menu.c \ - netk-workspace.c \ - netk-xutils.c \ - netk-xutils.h \ session-client.c \ session-client.h \ preview_filesel.c \ @@ -205,45 +159,15 @@ ## if MAINTAINER_MODE CLEANFILES = \ - xgen-netc \ - xgen-neth \ - xgen-nmc \ - xgen-nmh + xgen-guih \ + xgen-guic DISTCLEANFILES = \ - stamp-netk-enum-types.h \ - stamp-netk-marshal.h \ - $(netk_built_sources) \ $(gui_built_sources) BUILT_SOURCES = \ - $(netk_built_sources) \ $(gui_built_sources) -netk-enum-types.h: stamp-netk-enum-types.h - @true -stamp-netk-enum-types.h: $(netk_headers) Makefile - ( cd $(srcdir) && glib-mkenums \ - --fhead "#ifndef __NETK_ENUM_TYPES_H__\n#define __NETK_ENUM_TYPES_H__\n" \ - --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define NETK_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "#endif /* __NETK_ENUM_TYPES_H__ */" \ - $(netk_headers) ) > xgen-neth \ - && (cmp -s xgen-neth netk-enum-types.h || cp xgen-neth netk-enum-types.h) \ - && rm -f xgen-neth \ - && echo timestamp > $(@F) - -netk-enum-types.c: $(netk_headers) Makefile - ( cd $(srcdir) && glib-mkenums \ - --fhead "#include " \ - --fprod "\n/* enumerations from \"@filename@\" */" \ - --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ - $(netk_headers) ) >> xgen-netc \ - && cp xgen-netc netk-enum-types.c \ - && rm -f xgen-netc - gui-enum-types.h: stamp-gui-enum-types.h @true stamp-gui-enum-types.h: $(gui_headers) Makefile @@ -267,31 +191,8 @@ $(gui_headers) ) >> xgen-guic \ && cp xgen-guic gui-enum-types.c \ && rm -f xgen-guic - -netk-marshal.h: stamp-netk-marshal.h - @true -stamp-netk-marshal.h: netk-marshal.list Makefile - ( cd $(srcdir) && glib-genmarshal \ - --prefix=p_netk_marshal \ - --header netk-marshal.list ) >> xgen-nmh \ - && (cmp -s xgen-nmh netk-marshal.h || cp xgen-nmh netk-marshal.h) \ - && rm -f xgen-nmh \ - && echo timestamp > $(@F) - -netk-marshal.c: netk-marshal.list Makefile - ( cd $(srcdir) \ - && echo "#include " \ - && glib-genmarshal \ - --prefix=p_netk_marshal \ - --body netk-marshal.list ) >> xgen-nmc \ - && cp xgen-nmc netk-marshal.c \ - && rm -f xgen-nmc endif -netk-inlinepixbufs.h: $(srcdir)/default_icon.png - gdk-pixbuf-csource --raw --build-list \ - default_icon_data $(srcdir)/default_icon.png > netk-inlinepixbufs.h - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libxfcegui4-1.0.pc @@ -299,13 +200,6 @@ dist-hook: all EXTRA_DIST= \ - default_icon.png \ - libxfcegui4-config.h.in \ - netk-inlinepixbufs.h \ - netk-marshal.list + libxfcegui4-config.h.in -noinst_DATA = \ - default_icon.png \ - netk-inlinepixbufs.h - # vi:set ts=8 sw=8 noet ai nocindent syntax=automake: