/soc/2015/mmcc/main: 84f7313ab588: remove now-useless GTK 3 comp...

Changeset: 84f7313ab58862f3b183035fcbda36cea72a9258
Author:	 Michael McConville <[email protected]>
Date:	 2015-07-07 20:22 -0400
Branch:	 default
URL: https://hg.pidgin.im/soc/2015/mmcc/main/rev/84f7313ab588

Description:

remove now-useless GTK 3 compat function

diffstat:

 pidgin/gtk3compat.h |  6 ------
 pidgin/gtkconv.c    |  2 +-
 pidgin/gtkpounce.c  |  6 +++---
 pidgin/gtkprefs.c   |  2 +-
 pidgin/gtkrequest.c |  4 ++--
 pidgin/gtkxfer.c    |  2 +-
 6 files changed, 8 insertions(+), 14 deletions(-)

diffs (97 lines):

diff --git a/pidgin/gtk3compat.h b/pidgin/gtk3compat.h
--- a/pidgin/gtk3compat.h
+++ b/pidgin/gtk3compat.h
@@ -58,12 +58,6 @@ pidgin_color_chooser_get_rgb(GtkColorCho
 	rgb->blue = (int)round(rgba.blue * 65535.0);
 }
 
-static inline GtkWidget *
-gtk_grid_table_new(guint rows, guint columns)
-{
-	return gtk_grid_new();
-}
-
 static inline void
 gtk_grid_attach_defaults(GtkGrid *grid, GtkWidget *child, gint left, gint top,
 	gint width, gint height)
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -985,7 +985,7 @@ invite_cb(GtkWidget *widget, PidginConve
 		gtk_container_add(GTK_CONTAINER(vbox), hbox);
 
 		/* Setup the grid we're going to use to lay stuff out. */
-		grid = gtk_grid_table_new(2, 2);
+		grid = gtk_grid_new();
 		gtk_grid_set_row_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE);
 		gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE);
 		gtk_container_set_border_width(GTK_CONTAINER(grid), PIDGIN_HIG_BORDER);
diff --git a/pidgin/gtkpounce.c b/pidgin/gtkpounce.c
--- a/pidgin/gtkpounce.c
+++ b/pidgin/gtkpounce.c
@@ -626,7 +626,7 @@ pidgin_pounce_editor_show(PurpleAccount 
 	/* Create the "Pounce When Buddy..." frame. */
 	frame = pidgin_make_frame(vbox2, _("Pounce When Buddy..."));
 
-	grid = gtk_grid_table_new(5, 2);
+	grid = gtk_grid_new();
 	gtk_container_add(GTK_CONTAINER(frame), grid);
 	gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BORDER);
 	gtk_widget_show(grid);
@@ -687,7 +687,7 @@ pidgin_pounce_editor_show(PurpleAccount 
 	/* Create the "Action" frame. */
 	frame = pidgin_make_frame(vbox2, _("Action"));
 
-	grid = gtk_grid_table_new(3, 6);
+	grid = gtk_grid_new();
 	gtk_container_add(GTK_CONTAINER(frame), grid);
 	gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BORDER);
 	gtk_widget_show(grid);
@@ -846,7 +846,7 @@ pidgin_pounce_editor_show(PurpleAccount 
 	/* Create the "Options" frame. */
 	frame = pidgin_make_frame(vbox2, _("Options"));
 
-	grid = gtk_grid_table_new(2, 1);
+	grid = gtk_grid_new();
 	gtk_container_add(GTK_CONTAINER(frame), grid);
 	gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BORDER);
 	gtk_widget_show(grid);
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -2595,7 +2595,7 @@ proxy_page(void)
 		purple_prefs_connect_callback(prefs, "/purple/proxy/type",
 					    proxy_changed_cb, prefs_proxy_subframe);
 
-		grid = gtk_grid_table_new(4, 2);
+		grid = gtk_grid_new();
 		gtk_container_set_border_width(GTK_CONTAINER(grid), 0);
 		gtk_grid_set_column_spacing(GTK_GRID(grid), 5);
 		gtk_grid_set_row_spacing(GTK_GRID(grid), 10);
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
--- a/pidgin/gtkrequest.c
+++ b/pidgin/gtkrequest.c
@@ -2304,9 +2304,9 @@ pidgin_request_fields(const char *title,
 		}
 
 		if (compact)
-			grid = gtk_grid_table_new(rows, cols);
+			grid = gtk_grid_new();
 		else
-			grid = gtk_grid_table_new(rows, 2 * cols);
+			grid = gtk_grid_new();
 		gtk_grid_set_row_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE);
 		gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE);
 
diff --git a/pidgin/gtkxfer.c b/pidgin/gtkxfer.c
--- a/pidgin/gtkxfer.c
+++ b/pidgin/gtkxfer.c
@@ -662,7 +662,7 @@ make_info_grid(PidginXferDialog *dialog)
 	};
 
 	/* Setup the initial grid */
-	dialog->grid = grid = gtk_grid_table_new(G_N_ELEMENTS(labels) + 1, 2);
+	dialog->grid = grid = gtk_grid_new();
 	gtk_grid_set_row_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE);
 	gtk_grid_set_column_spacing(GTK_GRID(grid), PIDGIN_HIG_BOX_SPACE);
 

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits