Mercurial > pidgin

changeset 14432:3ac156db9cb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 17146] This will get rid of the compile warnings about redefining DEBUG. I thought about #undef-ing it first. But rekkanoryo suggested renaming to GNTDEBUG, which makes a lot more sense. committer: Tailor Script <tailor@pidgin.im>
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sun, 03 Sep 2006 21:42:52 +0000
parents 0ed8b285a44b
children aa4e9beab4de
files console/libgnt/gnt-skel.c console/libgnt/gntbox.c console/libgnt/gntbutton.c console/libgnt/gntcheckbox.c console/libgnt/gntcombobox.c console/libgnt/gntentry.c console/libgnt/gntlabel.c console/libgnt/gntline.c console/libgnt/gnttextview.c console/libgnt/gnttree.c console/libgnt/gntwidget.c console/libgnt/gntwidget.h
diffstat 12 files changed, 45 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/console/libgnt/gnt-skel.c	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gnt-skel.c	Sun Sep 03 21:42:52 2006 +0000
@@ -11,7 +11,7 @@
 static void
 gnt_skel_draw(GntWidget *widget)
 {
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -24,7 +24,7 @@
 {
 	if (widget->priv.width == 0 || widget->priv.height == 0)
 		gnt_widget_size_request(widget);
-	DEBUG;
+	GNTDEBUG;
 }
 
 static gboolean
@@ -50,13 +50,13 @@
 	parent_class->size_request = gnt_skel_size_request;
 	parent_class->key_pressed = gnt_skel_key_pressed;
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
 gnt_skel_init(GTypeInstance *instance, gpointer class)
 {
-	DEBUG;
+	GNTDEBUG;
 }
 
 /******************************************************************************
--- a/console/libgnt/gntbox.c	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gntbox.c	Sun Sep 03 21:42:52 2006 +0000
@@ -68,7 +68,7 @@
 		g_free(title);
 	}
 	
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -215,7 +215,7 @@
 		gnt_widget_size_request(widget);
 		find_focusable_widget(GNT_BOX(widget));
 	}
-	DEBUG;
+	GNTDEBUG;
 }
 
 /* Ensures that the current widget can take focus */
@@ -498,7 +498,7 @@
 	parent_class->confirm_size = gnt_box_confirm_size;
 	parent_class->size_changed = gnt_box_size_changed;
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -507,7 +507,7 @@
 	/* Initially make both the height and width resizable.
 	 * Update the flags as necessary when widgets are added to it. */
 	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(instance), GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y);
-	DEBUG;
+	GNTDEBUG;
 }
 
 /******************************************************************************
--- a/console/libgnt/gntbutton.c	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gntbutton.c	Sun Sep 03 21:42:52 2006 +0000
@@ -25,7 +25,7 @@
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(type));
 	mvwprintw(widget->window, 1, 2, button->priv->text);
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -44,7 +44,7 @@
 {
 	if (widget->priv.width == 0 || widget->priv.height == 0)
 		gnt_widget_size_request(widget);
-	DEBUG;
+	GNTDEBUG;
 }
 
 static gboolean
@@ -78,7 +78,7 @@
 	parent_class->key_pressed = gnt_button_key_pressed;
 	parent_class->clicked = gnt_button_clicked;
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -92,7 +92,7 @@
 
 	widget->priv.minw = 4;
 	widget->priv.minh = 3;
-	DEBUG;
+	GNTDEBUG;
 }
 
 /******************************************************************************
--- a/console/libgnt/gntcheckbox.c	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gntcheckbox.c	Sun Sep 03 21:42:52 2006 +0000
@@ -30,7 +30,7 @@
 	wbkgdset(widget->window, '\0' | COLOR_PAIR(GNT_COLOR_NORMAL));
 	mvwprintw(widget->window, 0, 4, GNT_BUTTON(cb)->priv->text);
 	
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -43,7 +43,7 @@
 {
 	if (widget->priv.width == 0 || widget->priv.height == 0)
 		gnt_widget_size_request(widget);
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -102,14 +102,14 @@
 					 NULL, NULL,
 					 g_cclosure_marshal_VOID__VOID,
 					 G_TYPE_NONE, 0);
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
 gnt_check_box_init(GTypeInstance *instance, gpointer class)
 {
 	GNT_WIDGET_SET_FLAGS(GNT_WIDGET(instance), GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
-	DEBUG;
+	GNTDEBUG;
 }
 
 /******************************************************************************
--- a/console/libgnt/gntcombobox.c	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gntcombobox.c	Sun Sep 03 21:42:52 2006 +0000
@@ -62,7 +62,7 @@
 	mvwaddch(widget->window, 1, widget->priv.width - 2, ACS_DARROW | COLOR_PAIR(GNT_COLOR_NORMAL));
 
 	g_free(text);
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -82,7 +82,7 @@
 {
 	if (widget->priv.width == 0 || widget->priv.height == 0)
 		gnt_widget_size_request(widget);
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -208,7 +208,7 @@
 					 gnt_closure_marshal_VOID__POINTER_POINTER,
 					 G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -229,7 +229,7 @@
 	
 	widget->priv.minw = 4;
 	widget->priv.minh = 3;
-	DEBUG;
+	GNTDEBUG;
 }
 
 /******************************************************************************
--- a/console/libgnt/gntentry.c	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gntentry.c	Sun Sep 03 21:42:52 2006 +0000
@@ -129,7 +129,7 @@
 		mvwchgat(widget->window, 0, gnt_util_onscreen_width(entry->scroll, entry->cursor),
 				1, A_REVERSE, COLOR_PAIR(GNT_COLOR_TEXT_NORMAL), NULL);
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -147,7 +147,7 @@
 {
 	if (widget->priv.width == 0 || widget->priv.height == 0)
 		gnt_widget_size_request(widget);
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -502,7 +502,7 @@
 	parent_class->key_pressed = gnt_entry_key_pressed;
 	parent_class->lost_focus = gnt_entry_lost_focus;
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -528,7 +528,7 @@
 	widget->priv.minw = 3;
 	widget->priv.minh = 1;
 	
-	DEBUG;
+	GNTDEBUG;
 }
 
 /******************************************************************************
--- a/console/libgnt/gntlabel.c	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gntlabel.c	Sun Sep 03 21:42:52 2006 +0000
@@ -27,7 +27,7 @@
 	wbkgdset(widget->window, '\0' | flag);
 	mvwprintw(widget->window, 0, 0, label->text);
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -48,7 +48,7 @@
 	parent_class->map = NULL;
 	parent_class->size_request = gnt_label_size_request;
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -58,7 +58,7 @@
 	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X);
 	widget->priv.minw = 3;
 	widget->priv.minh = 1;
-	DEBUG;
+	GNTDEBUG;
 }
 
 /******************************************************************************
--- a/console/libgnt/gntline.c	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gntline.c	Sun Sep 03 21:42:52 2006 +0000
@@ -40,7 +40,7 @@
 {
 	if (widget->priv.width == 0 || widget->priv.height == 0)
 		gnt_widget_size_request(widget);
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -51,7 +51,7 @@
 	parent_class->map = gnt_line_map;
 	parent_class->size_request = gnt_line_size_request;
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -61,7 +61,7 @@
 	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER);
 	widget->priv.minw = 1;
 	widget->priv.minh = 1;
-	DEBUG;
+	GNTDEBUG;
 }
 
 /******************************************************************************
--- a/console/libgnt/gnttextview.c	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gnttextview.c	Sun Sep 03 21:42:52 2006 +0000
@@ -92,7 +92,7 @@
 			((view->list && view->list->prev) ? ACS_DARROW : ' ') |
 				COLOR_PAIR(GNT_COLOR_HIGHLIGHT_D));
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -109,7 +109,7 @@
 {
 	if (widget->priv.width == 0 || widget->priv.height == 0)
 		gnt_widget_size_request(widget);
-	DEBUG;
+	GNTDEBUG;
 }
 
 static gboolean
@@ -235,7 +235,7 @@
 	parent_class->clicked = gnt_text_view_clicked;
 	parent_class->size_changed = gnt_text_view_size_changed;
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -247,7 +247,7 @@
 
 	widget->priv.minw = 5;
 	widget->priv.minh = 2;
-	DEBUG;
+	GNTDEBUG;
 }
 
 /******************************************************************************
--- a/console/libgnt/gnttree.c	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gnttree.c	Sun Sep 03 21:42:52 2006 +0000
@@ -419,7 +419,7 @@
 
 	redraw_tree(tree);
 	
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -447,7 +447,7 @@
 	}
 	tree->top = tree->root;
 	tree->current = tree->root;
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -689,7 +689,7 @@
 					 g_cclosure_marshal_VOID__POINTER,
 					 G_TYPE_NONE, 1, G_TYPE_POINTER);
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -699,7 +699,7 @@
 	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y);
 	widget->priv.minw = 4;
 	widget->priv.minh = 4;
-	DEBUG;
+	GNTDEBUG;
 }
 
 /******************************************************************************
--- a/console/libgnt/gntwidget.c	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gntwidget.c	Sun Sep 03 21:42:52 2006 +0000
@@ -33,14 +33,14 @@
 {
 	GntWidget *widget = GNT_WIDGET(instance);
 	widget->priv.name = NULL;
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
 gnt_widget_map(GntWidget *widget)
 {
 	/* Get some default size for the widget */
-	DEBUG;
+	GNTDEBUG;
 	g_signal_emit(widget, signals[SIG_MAP], 0);
 	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_MAPPED);
 }
@@ -59,7 +59,7 @@
 	}
 
 	parent_class->dispose(obj);
-	DEBUG;
+	GNTDEBUG;
 }
 
 static void
@@ -225,7 +225,7 @@
 					 gnt_closure_marshal_BOOLEAN__INT_INT_INT,
 					 G_TYPE_BOOLEAN, 3, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
 
-	DEBUG;
+	GNTDEBUG;
 }
 
 /******************************************************************************
@@ -305,7 +305,7 @@
 	delwin(obj->window);
 	if(!(GNT_WIDGET_FLAGS(obj) & GNT_WIDGET_DESTROYING))
 		g_object_run_dispose(G_OBJECT(obj));
-	DEBUG;
+	GNTDEBUG;
 }
 
 void
--- a/console/libgnt/gntwidget.h	Sun Sep 03 21:22:14 2006 +0000
+++ b/console/libgnt/gntwidget.h	Sun Sep 03 21:42:52 2006 +0000
@@ -19,7 +19,8 @@
 #define GNT_WIDGET_SET_FLAGS(obj, flags)		(GNT_WIDGET_FLAGS(obj) |= flags)
 #define GNT_WIDGET_UNSET_FLAGS(obj, flags)	(GNT_WIDGET_FLAGS(obj) &= ~(flags))
 #define GNT_WIDGET_IS_FLAG_SET(obj, flags)	(GNT_WIDGET_FLAGS(obj) & (flags))
-#define	DEBUG	fprintf(stderr, "%s\n", __FUNCTION__)
+
+#define	GNTDEBUG	fprintf(stderr, "%s\n", __FUNCTION__)
 
 typedef struct _GnWidget			GntWidget;
 typedef struct _GnWidgetPriv		GntWidgetPriv;