Hi! This patch just renames the header with the public API of the newt frontend to something a little more consistent with the namespace.
--- packages/cdebconf/debian/changelog | 2 ++ .../cdebconf/src/modules/frontend/newt/Makefile | 2 +- .../src/modules/frontend/newt/cdebconf_newt.h | 20 ++++++++++++++++++++ .../src/modules/frontend/newt/config-newt.h | 20 -------------------- packages/cdebconf/src/modules/frontend/newt/newt.c | 2 +- 5 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 packages/cdebconf/src/modules/frontend/newt/cdebconf_newt.h delete mode 100644 packages/cdebconf/src/modules/frontend/newt/config-newt.h diff --git a/packages/cdebconf/debian/changelog b/packages/cdebconf/debian/changelog index 830d6e8..5eb0e37 100644 --- a/packages/cdebconf/debian/changelog +++ b/packages/cdebconf/debian/changelog @@ -24,7 +24,9 @@ cdebconf (0.120) UNRELEASED; urgency=low * Put frontend plugins symbol in the "cdebconf_" namespaces. The old symbols are still looked up as a fallback to ensure compatibility. * Fix a memory leak in plugin_new() along the way. * Switch the newt frontend to use "cdebconf_newt_" namespace for its API. + * Rename config-newt.h to cebconf_newt.h for consistency. This header + defines the public interface used by plugins for the newt frontend. -- Joey Hess <[EMAIL PROTECTED]> Fri, 17 Aug 2007 13:54:30 -0400 diff --git a/packages/cdebconf/src/modules/frontend/newt/Makefile b/packages/cdebconf/src/modules/frontend/newt/Makefile index 56b9711..cea2ee3 100644 --- a/packages/cdebconf/src/modules/frontend/newt/Makefile +++ b/packages/cdebconf/src/modules/frontend/newt/Makefile @@ -8,5 +8,5 @@ include ../modules.mak install:: ifneq ($(TARGET),udeb) - install -m 644 ${srcdir}/src/modules/frontend/newt/config-newt.h $(DESTDIR)${incdir} + install -m 644 ${srcdir}/src/modules/frontend/newt/cdebconf_newt.h $(DESTDIR)${incdir} endif diff --git a/packages/cdebconf/src/modules/frontend/newt/cdebconf_newt.h b/packages/cdebconf/src/modules/frontend/newt/cdebconf_newt.h new file mode 100644 index 0000000..9ec7ade --- /dev/null +++ b/packages/cdebconf/src/modules/frontend/newt/cdebconf_newt.h @@ -0,0 +1,20 @@ + +#ifndef _CDEBCONF_NEWT_H_ +#define _CDEBCONF_NEWT_H_ + +/* Horizontal offset between buttons and text box */ +#define TEXT_PADDING 1 +/* Horizontal offset between text box and borders */ +#define BUTTON_PADDING 4 + +#define cdebconf_newt_create_form(scrollbar) newtForm((scrollbar), NULL, 0) + +void cdebconf_newt_create_window(const int width, const int height, const char *title, const char *priority); + +int +cdebconf_newt_get_text_height(const char *text, int win_width); + +int +cdebconf_newt_get_text_width(const char *text); + +#endif /* _CDEBCONF_NEWT_H_ */ diff --git a/packages/cdebconf/src/modules/frontend/newt/config-newt.h b/packages/cdebconf/src/modules/frontend/newt/config-newt.h deleted file mode 100644 index b32f0b4..0000000 --- a/packages/cdebconf/src/modules/frontend/newt/config-newt.h +++ /dev/null @@ -1,20 +0,0 @@ - -#ifndef _CDEBCONF_CONFIG_NEWT_H_ -#define _CDEBCONF_CONFIG_NEWT_H_ - -/* Horizontal offset between buttons and text box */ -#define TEXT_PADDING 1 -/* Horizontal offset between text box and borders */ -#define BUTTON_PADDING 4 - -#define cdebconf_newt_create_form(scrollbar) newtForm((scrollbar), NULL, 0) - -void cdebconf_newt_create_window(const int width, const int height, const char *title, const char *priority); - -int -cdebconf_newt_get_text_height(const char *text, int win_width); - -int -cdebconf_newt_get_text_width(const char *text); - -#endif /* _CDEBCONF_CONFIG_NEWT_H_ */ diff --git a/packages/cdebconf/src/modules/frontend/newt/newt.c b/packages/cdebconf/src/modules/frontend/newt/newt.c index 7bb85dd..0e1270b 100644 --- a/packages/cdebconf/src/modules/frontend/newt/newt.c +++ b/packages/cdebconf/src/modules/frontend/newt/newt.c @@ -113,7 +113,7 @@ typedef int (newt_handler)(struct frontend *obj, struct question *q); static void newt_progress_stop(struct frontend *obj); -#include "config-newt.h" +#include "cdebconf_newt.h" /* Horizontal offset between buttons and text box */ #define TEXT_PADDING 1 -- Jérémy Bobbio .''`. [EMAIL PROTECTED] : :Ⓐ : # apt-get install anarchism `. `'` `-
signature.asc
Description: Digital signature