[Commits] [SCM] claws branch, gtk3, updated. 3.16.0-452-g10993cf

[ticho at claws-mail.org]

The branch, gtk3 has been updated
       via  10993cfa64528fe3cdadf4131c1a0efaca40060e (commit)
      from  fb286ec8af9d774cc532e896b35798b71c18e00b (commit)

Summary of changes:
 src/gtk/menu.c |   39 ---------------------------------------
 src/gtk/menu.h |    3 ---
 2 files changed, 42 deletions(-)


- Log -----------------------------------------------------------------
commit 10993cfa64528fe3cdadf4131c1a0efaca40060e
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Nov 3 19:31:31 2018 +0100

    Remove last remnants of GtkCMOptionMenu from code.

diff --git a/src/gtk/menu.c b/src/gtk/menu.c
index 438a56b..beba6a6 100644
--- a/src/gtk/menu.c
+++ b/src/gtk/menu.c
@@ -26,9 +26,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#if !GTK_CHECK_VERSION(3, 0, 0)
-#include "gtkcmoptionmenu.h"
-#endif
 #include "menu.h"
 #include "utils.h"
 #include "gtkutils.h"
@@ -210,39 +207,3 @@ void menu_button_position(GtkMenu *menu, gint *x, gint *y, gboolean *push_in,
 	if (*y + mreq.height >= monitor.height)
 		*y -= mreq.height;
 }
-
-#if !GTK_CHECK_VERSION(3, 0, 0)
-gint menu_find_option_menu_index(GtkCMOptionMenu *optmenu, gpointer data,
-				 GCompareFunc func)
-{
-	GtkWidget *menu;
-	GtkWidget *menuitem;
-	gpointer menu_data;
-	GList *children;
-	GList *cur;
-	gint n, found = -1;
-
-	menu = gtk_cmoption_menu_get_menu(optmenu);
-	children = gtk_container_get_children(GTK_CONTAINER(GTK_MENU_SHELL(menu)));
-
-	for (cur = children, n = 0;
-	     cur != NULL; cur = cur->next, n++) {
-		menuitem = GTK_WIDGET(cur->data);
-		menu_data = g_object_get_data(G_OBJECT(menuitem),
-					      MENU_VAL_ID);
-		if (func) {
-			if (func(menu_data, data) == 0) {
-				found = n;
-				break;
-			}
-		} else if (menu_data == data) {
-			found = n;
-			break;
-		}
-	}
-
-	g_list_free(children);
-
-	return found;
-}
-#endif
diff --git a/src/gtk/menu.h b/src/gtk/menu.h
index 7e4b0da..2e4a58c 100644
--- a/src/gtk/menu.h
+++ b/src/gtk/menu.h
@@ -22,9 +22,6 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#if !GTK_CHECK_VERSION(3, 0, 0)
-#include "gtkcmoptionmenu.h"
-#endif
 
 #define MENU_VAL_ID "Claws::Menu::ValueID"
 #define MENU_VAL_DATA "Claws::Menu::ValueDATA"

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail