pidgin: 887e07e3: Restore the "Time Remaining" field in th...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 887e07e33e197965af1d590e4936f6c082494ea7
Ancestor: 7d328b30bc18c77fc3de6e2870b9b576fac4ab1c
Author: qulogic at pidgin.im
Date: 2009-06-10T01:07:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/887e07e33e197965af1d590e4936f6c082494ea7

Modified files:
        pidgin/gtkft.c

ChangeLog: 

Restore the "Time Remaining" field in the file transfer window, but not in
exactly the same way as the patch in the ticket.

Fixes #9329.

-------------- next part --------------
============================================================
--- pidgin/gtkft.c	c1953b131ac097db9c78ae09004bdd40b9fceba7
+++ pidgin/gtkft.c	5819c5c048f97f403a82a5fcf6ef5bc3f4423425
@@ -705,12 +705,12 @@ make_info_table(PidginXferDialog *dialog
 	};
 
 	/* Setup the initial table */
-	dialog->table = table = gtk_table_new(9, 2, FALSE);
+	dialog->table = table = gtk_table_new(G_N_ELEMENTS(labels), 2, FALSE);
 	gtk_table_set_row_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE);
 	gtk_table_set_col_spacings(GTK_TABLE(table), PIDGIN_HIG_BOX_SPACE);
 
 	/* Setup the labels */
-	for (i = 0; i < sizeof(labels) / sizeof(*labels); i++) {
+	for (i = 0; i < G_N_ELEMENTS(labels); i++) {
 		GtkWidget *label;
 		char buf[256];
 
@@ -734,7 +734,9 @@ make_info_table(PidginXferDialog *dialog
 
 	/* Setup the progress bar */
 	dialog->progress = gtk_progress_bar_new();
-	gtk_table_attach(GTK_TABLE(table), dialog->progress, 0, 2, 8, 9,
+	gtk_table_attach(GTK_TABLE(table), dialog->progress,
+					 0, 2,
+					 G_N_ELEMENTS(labels), G_N_ELEMENTS(labels) + 1,
 					 GTK_FILL, GTK_FILL, 0, 0);
 	gtk_widget_show(dialog->progress);