/soc/2015/mmcc/main: 2154fa48c564: replace the last remaining GT...

[Michael McConville]

Changeset: 2154fa48c564b180273d64705041d6e2e015831b
Author:	 Michael McConville <mmcconville at mykolab.com>
Date:	 2015-06-26 18:21 -0400
Branch:	 default
URL: https://hg.pidgin.im/soc/2015/mmcc/main/rev/2154fa48c564

Description:

replace the last remaining GTK stock item, replace two deprecated GTK functions

diffstat:

 pidgin/gtk3compat.h |  4 ++--
 pidgin/gtkutils.c   |  2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (26 lines):

diff --git a/pidgin/gtk3compat.h b/pidgin/gtk3compat.h
--- a/pidgin/gtk3compat.h
+++ b/pidgin/gtk3compat.h
@@ -84,8 +84,8 @@ gtk_grid_attach_full(GtkGrid *grid, GtkW
 		gtk_widget_set_hexpand(child, TRUE);
 	if (!(xoptions & GTK_FILL))
 		gtk_widget_set_halign(child, GTK_ALIGN_CENTER);
-	gtk_widget_set_margin_left(child, xpadding);
-	gtk_widget_set_margin_right(child, xpadding);
+	gtk_widget_set_margin_start(child, xpadding);
+	gtk_widget_set_margin_end(child, xpadding);
 
 	if (yoptions & GTK_EXPAND)
 		gtk_widget_set_vexpand(child, TRUE);
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -3286,7 +3286,7 @@ file_context_menu(PidginWebView *webview
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
 	/* Open Containing Directory */
-	img = gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU);
+	img = gtk_image_new_from_icon_name("folder-open", GTK_ICON_SIZE_MENU);
 	item = gtk_image_menu_item_new_with_mnemonic(_("Open _Containing Directory"));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), img);
 	/* The signal owns url now: */