HGKeeper

propagate from branch 'im.pidgin.pidgin' (head 96e325d99c57eb4ba06feda7c2ee83a291e97478)
next.minor
2009-12-09, Paul Aurich

be85ba7ef2e9

Parents 96dbe7678d31 96e325d99c57
Children 8140b7590e86 9ea1c7693c39

propagate from branch 'im.pidgin.pidgin' (head 96e325d99c57eb4ba06feda7c2ee83a291e97478)
to branch 'im.pidgin.pidgin.next.minor' (head 96dbe7678d31d7f6bc9bdccf25be8007eafa9d21)

3 files changed, 5 insertions(+), 7 deletions(-)

+1 -1

gntkeys.h

+2 -4

gntutils.c

+2 -2

wms/s.c

~~--- a/gntkeys.h Mon Nov 23 23:53:19 2009 +0000~~

+++ b/gntkeys.h Wed Dec 09 03:52:00 2009 +0000

@@ -65,7 +65,7 @@

#define GNT_KEY_BACKSPACE SAFE(key_backspace)

#define GNT_KEY_DEL SAFE(key_dc)

#define GNT_KEY_INS SAFE(key_ic)

~~-#define GNT_KEY_BACK_TAB SAFE(back_tab)~~

+#define GNT_KEY_BACK_TAB (back_tab ? back_tab : SAFE(key_btab))

#define GNT_KEY_CTRL_A "\001"

#define GNT_KEY_CTRL_B "\002"

~~--- a/gntutils.c Mon Nov 23 23:53:19 2009 +0000~~

+++ b/gntutils.c Wed Dec 09 03:52:00 2009 +0000

@@ -20,6 +20,8 @@

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA

*/

+#include "config.h"

+

#include "gntinternal.h"

#undef GNT_LOG_DOMAIN

#define GNT_LOG_DOMAIN "Utils"

@@ -35,8 +37,6 @@

#include "gntutils.h"

#include "gntwindow.h"

~~-#include "config.h"~~

-

#include <stdarg.h>

#include <stdlib.h>

#include <string.h>

@@ -46,8 +46,6 @@

#include <libxml/tree.h>

#endif

~~-#include "config.h"~~

-

void gnt_util_get_text_bound(const char *text, int *width, int *height)

{

const char *s = text, *last;

~~--- a/wms/s.c Mon Nov 23 23:53:19 2009 +0000~~

+++ b/wms/s.c Wed Dec 09 03:52:00 2009 +0000

@@ -1,8 +1,8 @@

+#include "internal.h"

+

#include <string.h>

#include <sys/types.h>

~~-#include "internal.h"~~

-

#include "gnt.h"

#include "gntbox.h"

#include "gntmenu.h"

qulogic/libgnt