[Sugar-devel] [PATCH sugar-toolkit-gtk3] Drop broken sugar-menu C module

[Sascha Silbe]

The sugar-menu C module is going to be replaced by Python code soon and
doesn't even compile anymore (thus aborting the build with an error).

Signed-off-by: Sascha Silbe <silbe at activitycentral.com>
---

Either this patch or Daniels patch "Reimplement Palettes for GTK3" [1]
needs to land in sugar-toolkit-gtk3 before the latter can be added to
sugar-jhbuild.

[1] https://patchwork.sugarlabs.org/patch/1082/

 src/sugar3/Makefile.am  |    4 +--
 src/sugar3/sugar-menu.c |   63 -----------------------------------------------
 src/sugar3/sugar-menu.h |   57 ------------------------------------------
 3 files changed, 1 insertions(+), 123 deletions(-)

diff --git a/src/sugar3/Makefile.am b/src/sugar3/Makefile.am
index e795c27..bc62631 100644
--- a/src/sugar3/Makefile.am
+++ b/src/sugar3/Makefile.am
@@ -53,9 +53,7 @@ libsugarext_la_SOURCES =		\
 	sugar-grid.c			\
 	sugar-grid.h			\
 	sugar-key-grabber.c		\
-	sugar-key-grabber.h		\
-	sugar-menu.c			\
-	sugar-menu.h
+	sugar-key-grabber.h

 sugar_LTLIBRARIES = _sugarbaseext.la

diff --git a/src/sugar3/sugar-menu.c b/src/sugar3/sugar-menu.c
deleted file mode 100644
index f19dc4b..0000000
--- a/src/sugar3/sugar-menu.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2006-2007, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <gtk/gtkwindow.h>
-
-#include "sugar-menu.h"
-
-static void sugar_menu_class_init (SugarMenuClass *menu_class);
-static void sugar_menu_init       (SugarMenu *menu);
-
-
-G_DEFINE_TYPE(SugarMenu, sugar_menu, GTK_TYPE_MENU)
-
-void
-sugar_menu_set_active(SugarMenu *menu, gboolean active)
-{
-    GTK_MENU_SHELL(menu)->active = active;
-}
-
-void
-sugar_menu_embed(SugarMenu *menu, GtkContainer *parent)
-{
-    menu->orig_toplevel = GTK_MENU(menu)->toplevel;
-
-    GTK_MENU(menu)->toplevel = gtk_widget_get_toplevel(GTK_WIDGET(parent));
-    gtk_widget_reparent(GTK_WIDGET(menu), GTK_WIDGET(parent));
-}
-
-void
-sugar_menu_unembed(SugarMenu *menu)
-{
-    if (menu->orig_toplevel) {
-        GTK_MENU(menu)->toplevel = menu->orig_toplevel;
-        gtk_widget_reparent(GTK_WIDGET(menu), GTK_WIDGET(menu->orig_toplevel));
-    }
-}
-
-static void
-sugar_menu_class_init(SugarMenuClass *menu_class)
-{
-}
-
-static void
-sugar_menu_init(SugarMenu *menu)
-{
-    menu->orig_toplevel = NULL;
-}
diff --git a/src/sugar3/sugar-menu.h b/src/sugar3/sugar-menu.h
deleted file mode 100644
index c3bb3d0..0000000
--- a/src/sugar3/sugar-menu.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2006-2007, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __SUGAR_MENU_H__
-#define __SUGAR_MENU_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-typedef struct _SugarMenu SugarMenu;
-typedef struct _SugarMenuClass SugarMenuClass;
-
-#define SUGAR_TYPE_MENU			     (sugar_menu_get_type())
-#define SUGAR_MENU(object)	         (G_TYPE_CHECK_INSTANCE_CAST((object), SUGAR_TYPE_MENU, SugarMenu))
-#define SUGAR_MENU_CLASS(klass)	     (G_TYPE_CHACK_CLASS_CAST((klass), SUGAR_TYPE_MENU, SugarMenuClass))
-#define SUGAR_IS_MENU(object)	     (G_TYPE_CHECK_INSTANCE_TYPE((object), SUGAR_TYPE_MENU))
-#define SUGAR_IS_MENU_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE((klass), SUGAR_TYPE_MENU))
-#define SUGAR_MENU_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS((object), SUGAR_TYPE_MENU, SugarMenuClass))
-
-struct _SugarMenu {
-    GtkMenu base_instance;
-
-    GtkWidget *orig_toplevel;
-    int min_width;
-};
-
-struct _SugarMenuClass {
-	GtkMenuClass base_class;
-};
-
-GType	 sugar_menu_get_type   (void);
-void     sugar_menu_set_active (SugarMenu    *menu,
-                                gboolean      active);
-void     sugar_menu_embed      (SugarMenu    *menu,
-                                GtkContainer *parent);
-void     sugar_menu_unembed    (SugarMenu    *menu);
-
-G_END_DECLS
-
-#endif /* __SUGAR_MENU_H__ */
--
1.7.7.3