Mercurial > pidgin3 / changeset

--- a/finch/libgnt/gntfilesel.c	Fri Nov 24 01:35:46 2017 -0500
+++ b/finch/libgnt/gntfilesel.c	Mon Nov 27 20:55:41 2017 -0600
@@ -38,10 +38,6 @@
 
 #include <glib/gstdio.h>
 
-#if 0
-#include <glob.h>
-#endif
-
 enum
 {
 	SIG_FILE_SELECTED,
@@ -281,12 +277,7 @@
 {
 	char *path;
 	char *str;
-#if 0
-	int count;
-	glob_t gl;
-	GStatBuf st;
-	int glob_ret;
-#endif
+
 	if (strcmp(key, "\r") && strcmp(key, "\n"))
 		return FALSE;
 
@@ -309,39 +300,9 @@
 		g_free(path);
 		return FALSE;
 	}
-#if 0
-	/* XXX: there needs to be a way to allow other methods for globbing,
-	 * like the read_fn stuff. */
-	glob_ret = glob(path, GLOB_MARK, NULL, &gl);
-	if (!glob_ret) {  /* XXX: do something with the return value */
-		char *loc = g_path_get_dirname(gl.gl_pathv[0]);
 
-		g_stat(gl.gl_pathv[0], &st);
-		gnt_file_sel_set_current_location(sel, loc);  /* XXX: check the return value */
-		g_free(loc);
-		if (!S_ISDIR(st.st_mode) && !sel->dirsonly) {
-			gnt_tree_remove_all(GNT_TREE(sel->files));
-			for (count = 0; count < gl.gl_pathc; count++) {
-				char *tmp = process_path(gl.gl_pathv[count]);
-				loc = g_path_get_dirname(tmp);
-				if (g_utf8_collate(sel->current, loc) == 0) {
-					char *base = g_path_get_basename(tmp);
-					char size[128];
-					snprintf(size, sizeof(size), "%ld", (long)st.st_size);
-					gnt_tree_add_row_after(GNT_TREE(sel->files), base,
-							gnt_tree_create_row(GNT_TREE(sel->files), base, size, ""), NULL, NULL);
-				}
-				g_free(loc);
-				g_free(tmp);
-			}
-			gnt_widget_draw(sel->files);
-		}
-	} else if (sel->files) {
-		gnt_tree_remove_all(GNT_TREE(sel->files));
-		gnt_widget_draw(sel->files);
-	}
-	globfree(&gl);
-#endif
+	/* XXX: Add support for globbing via g_pattern_spec_* */
+
 success:
 	g_free(path);
 	return TRUE;

--- a/finch/libgnt/gntmain.c	Fri Nov 24 01:35:46 2017 -0500
+++ b/finch/libgnt/gntmain.c	Mon Nov 27 20:55:41 2017 -0600
@@ -340,12 +340,6 @@
 	}
 	*k = '\0';
 
-#if 0
-	gnt_warning("a key: [%s] %#x %#x %#x %#x %#x %#x", keys,
-		(guchar)keys[0], (guchar)keys[1], (guchar)keys[2],
-		(guchar)keys[3], (guchar)keys[4], (guchar)keys[5]);
-#endif
-
 	/* TODO: we could call detect_mouse_action here, but no
 	 * events are triggered (yet?) for mouse on win32.
 	 */
@@ -395,17 +389,6 @@
 	if (mouse_enabled && detect_mouse_action(k))
 		goto end;
 
-#if 0
-	/* I am not sure what's happening here. If this actually does something,
-	 * then this needs to go in gnt_keys_refine. */
-	if (*k < 0) { /* Alt not sending ESC* */
-		*(k + 1) = 128 - *k;
-		*k = 27;
-		*(k + 2) = 0;
-		rd++;
-	}
-#endif
-
 	while (rd) {
 		char back;
 		int p;
@@ -450,12 +433,6 @@
 
 	g_io_channel_set_close_on_unref(channel, TRUE);
 
-#if 0
-	g_io_channel_set_encoding(channel, NULL, NULL);
-	g_io_channel_set_buffered(channel, FALSE);
-	g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, NULL );
-#endif
-
 	channel_read_callback = result = g_io_add_watch_full(channel,  G_PRIORITY_HIGH,
 					(G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI),
 					io_invoke, NULL, NULL);
@@ -465,10 +442,6 @@
 					io_invoke_error, GINT_TO_POINTER(result), NULL);
 
 	g_io_channel_unref(channel);
-
-#if 0
-	gnt_warning("setting up IO (%d)", channel_read_callback);
-#endif
 }
 
 static gboolean

--- a/finch/libgnt/gntmenuitem.c	Fri Nov 24 01:35:46 2017 -0500
+++ b/finch/libgnt/gntmenuitem.c	Mon Nov 27 20:55:41 2017 -0600
@@ -65,13 +65,8 @@
 gnt_menuitem_init(GTypeInstance *instance, gpointer klass)
 {
 	GntMenuItem *item = GNT_MENU_ITEM(instance);
-#if 0
-	GntMenuItemPriv *priv = &item->priv;
 
-	priv->visible = TRUE;
-#else
 	item->visible = TRUE;
-#endif
 }
 
 /******************************************************************************
@@ -167,13 +162,7 @@
 void
 gnt_menuitem_set_visible(GntMenuItem *item, gboolean visible)
 {
-#if 0
-	GntMenuItemPriv *priv = &item->priv;
-
-	priv->visible = visible;
-#else
 	item->visible = visible;
-#endif
 }
 
 gboolean
@@ -181,11 +170,7 @@
 {
 	g_return_val_if_fail(GNT_IS_MENU_ITEM(item), FALSE);
 
-#if 0
-	return item->priv.visible;
-#else
 	return item->visible;
-#endif
 }
 
 void

--- a/finch/libgnt/gntwidget.c	Fri Nov 24 01:35:46 2017 -0500
+++ b/finch/libgnt/gntwidget.c	Mon Nov 27 20:55:41 2017 -0600
@@ -322,42 +322,8 @@
 
 	if (widget->window == NULL)
 	{
-#if 0
-		int x, y, maxx, maxy, w, h;
-		int oldw, oldh;
-		gboolean shadow = TRUE;
-
-		if (!gnt_widget_has_shadow(widget))
-			shadow = FALSE;
-
-		x = widget->priv.x;
-		y = widget->priv.y;
-		w = oldw = widget->priv.width + shadow;
-		h = oldh = widget->priv.height + shadow;
-
-		getmaxyx(stdscr, maxy, maxx);
-		maxy -= 1;		/* room for the taskbar */
+		widget->window = newpad(widget->priv.height + 20, widget->priv.width + 20);
 
-		x = MAX(0, x);
-		y = MAX(0, y);
-		if (x + w >= maxx)
-			x = MAX(0, maxx - w);
-		if (y + h >= maxy)
-			y = MAX(0, maxy - h);
-
-		w = MIN(w, maxx);
-		h = MIN(h, maxy);
-
-		widget->priv.x = x;
-		widget->priv.y = y;
-		if (w != oldw || h != oldh) {
-			widget->priv.width = w - shadow;
-			widget->priv.height = h - shadow;
-			g_signal_emit(widget, signals[SIG_SIZE_CHANGED], 0, oldw, oldh);
-		}
-#else
-		widget->window = newpad(widget->priv.height + 20, widget->priv.width + 20);  /* XXX: */
-#endif
 		init_widget(widget);
 	}
 
@@ -403,11 +369,6 @@
 {
 	g_signal_emit(widget, signals[SIG_HIDE], 0);
 	wbkgdset(widget->window, '\0' | gnt_color_pair(GNT_COLOR_NORMAL));
-#if 0
-	/* XXX: I have no clue why, but this seemed to be necessary. */
-	if (gnt_widget_has_shadow(widget))
-		mvwvline(widget->window, 1, widget->priv.width, ' ', widget->priv.height);
-#endif
 	gnt_screen_release(widget);
 	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_INVISIBLE);
 	GNT_WIDGET_UNSET_FLAGS(widget, GNT_WIDGET_MAPPED);

--- a/finch/libgnt/test.c	Fri Nov 24 01:35:46 2017 -0500
+++ b/finch/libgnt/test.c	Mon Nov 27 20:55:41 2017 -0600
@@ -16,25 +16,6 @@
 	gnt_box_set_title(GNT_BOX(box), "This is a test");
 
 	gnt_widget_show(box);
-#if 0
-
-	gnt_widget_set_focus(w, TRUE);
-
-	/* XXX: This is to just test stuff */
-	if (text[0] == 27)
-	{
-		if (strcmp(text+1, GNT_KEY_LEFT) == 0 && w->priv.x)
-			(w->priv.x)--;
-		else if (strcmp(text+1, GNT_KEY_RIGHT) == 0)
-			(w->priv.x)++;
-		else if (strcmp(text+1, GNT_KEY_UP) == 0 && w->priv.y)
-			(w->priv.y)--;
-		else if (strcmp(text+1, GNT_KEY_DOWN) == 0)
-			(w->priv.y)++;
-	}
-
-	gnt_widget_draw(w);
-#endif
 
 	return FALSE;
 }
@@ -57,11 +38,7 @@
 {
 	g_return_val_if_fail(GNT_IS_TREE(tree), FALSE);
 	gnt_tree_scroll(GNT_TREE(tree), 1);
-	/*wscrl(tree->window, 1);*/
-	/*box(tree->window, ACS_VLINE, ACS_HLINE);*/
-	/*wrefresh(tree->window);*/
-	/*char *s = 0;*/
-	/**s = 'a';*/
+
 	return TRUE;
 }
 
@@ -90,7 +67,6 @@
 	gnt_box_add_widget(GNT_BOX(vbox), widget2);
 
 	gnt_box_add_widget(GNT_BOX(hbox), label);
-	/*gnt_box_add_widget(GNT_BOX(hbox), vbox);*/
 
 	gnt_box_add_widget(GNT_BOX(hbox), gnt_entry_new("a"));
 
@@ -106,18 +82,12 @@
 	GNT_WIDGET_UNSET_FLAGS(hbox, GNT_WIDGET_NO_BORDER | GNT_WIDGET_NO_SHADOW);
 	gnt_box_set_title(GNT_BOX(hbox), "111111111111111111111111111111111111111111111111111111111111111This is the title …");
 
-	/*gnt_widget_set_take_focus(vbox, TRUE);*/
-	/*gnt_widget_set_take_focus(hbox, TRUE);*/
-	/*gnt_widget_set_position(hbox, 10, 10);*/
-
 	gnt_widget_show(hbox);
 
 	g_signal_connect(hbox, "key_pressed", G_CALLBACK(key_pressed), tree);
 	g_signal_connect(widget, "activate", G_CALLBACK(button1), hbox);
 	g_signal_connect(widget2, "activate", G_CALLBACK(button2), hbox);
 
-	/*g_timeout_add(1000, (GSourceFunc)w_scroll, tree);*/
-
 	gnt_main();
 
 	return 0;