From d4a16ba8067ed797a2a97374a9e78dc37add7216 Mon Sep 17 00:00:00 2001 From: Monsta Date: Wed, 1 Jul 2015 16:15:01 +0300 Subject: Revert "charpick: Do not use GtkStock" This reverts commit faaee1e86bc0e751693bc2297893bffe127e3c3c. + some more changes to resolve conflicts --- charpick/charpick.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'charpick/charpick.c') diff --git a/charpick/charpick.c b/charpick/charpick.c index b68dc561..2b6d5563 100644 --- a/charpick/charpick.c +++ b/charpick/charpick.c @@ -850,8 +850,9 @@ charpicker_applet_fill (MatePanelApplet *applet) } g_object_unref (action_group); + register_stock_for_edit (); populate_menu (curr_data); - + return TRUE; } -- cgit v1.2.1