[gnumeric] Remove the obsolete Hildon port

From: Morten Welinder <mortenw src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnumeric] Remove the obsolete Hildon port
Date: Mon, 24 Oct 2011 13:36:34 +0000 (UTC)
commit 63b71a7b4cb2aec1cc9167d81d073cd08a9f832a
Author: Adrian Bunk <bunk stusta de>
Date:   Fri Oct 21 20:17:16 2011 +0300

    Remove the obsolete Hildon port
    
    The GTK+ based Hildon is not likely to ever be ported to GTK+ 3.

 configure.in                      |   22 --
 gnumeric-features.h.in            |    2 -
 po-functions/POTFILES.skip        |    1 -
 po/POTFILES.in                    |    1 -
 src/.gitignore                    |    1 -
 src/HILDON_Gnumeric-gtk.xml.in    |  396 -------------------------------------
 src/Makefile.am                   |   19 +--
 src/gnm-pane.c                    |    6 -
 src/gui-file.c                    |   31 ---
 src/main-application.c            |   16 --
 src/wbc-gtk-actions.c             |    6 -
 src/wbc-gtk-impl.h                |    8 -
 src/wbc-gtk.c                     |  142 +-------------
 src/widgets/gnumeric-expr-entry.c |    4 -
 14 files changed, 12 insertions(+), 643 deletions(-)
---
diff --git a/configure.in b/configure.in
index 592c9e9..b8b61ba 100644
--- a/configure.in
+++ b/configure.in
@@ -242,28 +242,6 @@ if test $gnumeric_devel = yes; then
     fi
 fi
 
-dnl ==============================================
-dnl Maemo/Hildon based User Interface
-
-AC_ARG_ENABLE(hildon,
-	AS_HELP_STRING([--enable-hildon],[Build with Maemo/Hildon support]),
-    enable_hildon="$enableval",
-    enable_hildon=no)
-
-if test "x$enable_hildon" = xyes ; then
-    PKG_CHECK_MODULES(HILDON,
-                      hildon-libs hildon-fm libosso,
-                      HAVE_HILDON=yes, HAVE_HILDON=no)
-fi
-
-if test "x$HAVE_HILDON" = xyes ; then
-    AC_DEFINE(GNM_USE_HILDON, 1, [Build with Maemo/Hildon support])
-fi
-
-AM_CONDITIONAL(USE_HILDON, test "x$HAVE_HILDON" = xyes)
-AC_SUBST(HILDON_CFLAGS)
-AC_SUBST(HILDON_LIBS)
-
 dnl The following conditional is set in AM_GCONF_SOURCE_2.
 dnl Because we may skip its execution, we have to set a default here.
 m4_pattern_allow([^AM_GCONF_SOURCE_2$])
diff --git a/gnumeric-features.h.in b/gnumeric-features.h.in
index 9ebc455..4f208ee 100644
--- a/gnumeric-features.h.in
+++ b/gnumeric-features.h.in
@@ -17,8 +17,6 @@
 
 /* Define if UI is built */
 #undef GNM_WITH_GTK
-/* Build with Maemo/Hildon support */
-#undef GNM_USE_HILDON
 /* Define if the long double type is to be used */
 #undef GNM_WITH_LONG_DOUBLE
 /* Define if SOLVER is compiled */
diff --git a/po-functions/POTFILES.skip b/po-functions/POTFILES.skip
index 34b6614..b57a640 100644
--- a/po-functions/POTFILES.skip
+++ b/po-functions/POTFILES.skip
@@ -73,7 +73,6 @@ schemas/org.gnome.gnumeric.dialogs.gschema.xml.in.in
 schemas/org.gnome.gnumeric.gschema.xml.in.in
 schemas/org.gnome.gnumeric.plugin.gschema.xml.in.in
 src/GNOME_Gnumeric-gtk.xml.in
-src/HILDON_Gnumeric-gtk.xml.in
 templates/autoformat/3D.category.in
 templates/autoformat/Classical.category.in
 templates/autoformat/Colourful.category.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a184eba..8d62a97 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -127,7 +127,6 @@ schemas/org.gnome.gnumeric.dialogs.gschema.xml.in.in
 schemas/org.gnome.gnumeric.gschema.xml.in.in
 schemas/org.gnome.gnumeric.plugin.gschema.xml.in.in
 src/GNOME_Gnumeric-gtk.xml.in
-src/HILDON_Gnumeric-gtk.xml.in
 src/application.c
 src/cell.c
 src/clipboard.c
diff --git a/src/.gitignore b/src/.gitignore
index 2d16927..5391b59 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -25,7 +25,6 @@ sstest.exe
 test-pango
 test-pango.exe
 GNOME_Gnumeric-gtk.xml
-HILDON_Gnumeric-gtk.xml
 libspreadsheet.def
 local.def
 stamp-local.def
diff --git a/src/Makefile.am b/src/Makefile.am
index 11d5c25..20e69eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,8 +34,7 @@ AM_CPPFLAGS = 								\
 	-I$(srcdir)/widgets						\
 	-I$(srcdir)/dialogs						\
 	-I$(srcdir)/tools						\
-	$(GNUMERIC_CFLAGS)						\
-	$(HILDON_CFLAGS)
+	$(GNUMERIC_CFLAGS)
 
 # A hint is needed to build these headers first:
 BUILT_SOURCES =					\
@@ -54,8 +53,7 @@ libspreadsheet_la_LDFLAGS = -release $(VERSION)
 libspreadsheet_la_LIBADD = 			\
 	$(gnumeric_app_libs)			\
 	$(GNUMERIC_LIBS)			\
-	$(INTLLIBS)				\
-	$(HILDON_LIBS)
+	$(INTLLIBS)
 
 libspreadsheet_la_SOURCES =			\
 	go-val.h			\
@@ -336,8 +334,7 @@ gnumeric_SOURCES =				\
 gnumeric_LDADD =				\
 	libspreadsheet.la			\
 	$(GNUMERIC_LIBS)			\
-	$(INTLLIBS)				\
-	$(HILDON_LIBS)
+	$(INTLLIBS)
 gnumeric_LDFLAGS = -export-dynamic
 
 ssconvert_LDADD   = $(gnumeric_LDADD)
@@ -460,19 +457,11 @@ EXTRA_DIST = \
 	gnm-marshalers.list			\
 	README.gnm_float			\
 	gnumeric.rc gnm-i18n.h			\
-	GNOME_Gnumeric-gtk.xml.in		\
-	HILDON_Gnumeric-gtk.xml.in
+	GNOME_Gnumeric-gtk.xml.in
 
 gtkactiondir=$(gnumeric_datadir)
 
-if USE_HILDON
-gtkaction_DATA = HILDON_Gnumeric-gtk.xml
-HILDON_Gnumeric-gtk.xml: HILDON_Gnumeric-gtk.xml.in
-	sed -e 's/ _name *=/ name=/' <$<  >$@
-DISTCLEANFILES = HILDON_Gnumeric-gtk.xml
-else
 gtkaction_DATA = GNOME_Gnumeric-gtk.xml
 GNOME_Gnumeric-gtk.xml: GNOME_Gnumeric-gtk.xml.in
 	sed -e 's/ _name *=/ name=/' <$<  >$@
 DISTCLEANFILES = GNOME_Gnumeric-gtk.xml
-endif
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 7161fd1..acd62e7 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -5,10 +5,6 @@
  * Author:
  *     Miguel de Icaza (miguel kernel org)
  *     Jody Goldberg (jody gnome org)
- *
- * Port to Maemo:
- *	Eduardo Lima  (eduardo lima indt org br)
- *	Renato Araujo (renato filho indt org br)
  */
 #include <gnumeric-config.h>
 #include <glib/gi18n-lib.h>
@@ -649,7 +645,6 @@ gnm_pane_key_release (GtkWidget *widget, GdkEventKey *event)
 static gint
 gnm_pane_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
-#ifndef GNM_USE_HILDON
 	/* The first call to focus-in was sometimes the first thing to init the
 	 * imcontext.  In which case the im_context_focus_in would fire a
 	 * preedit-changed, and we would start editing. */
@@ -661,7 +656,6 @@ gnm_pane_focus_in (GtkWidget *widget, GdkEventFocus *event)
 		pane->im_first_focus = FALSE;
 		pane->im_block_edit_start = FALSE;
 	}
-#endif
 	return (*GTK_WIDGET_CLASS (parent_klass)->focus_in_event) (widget, event);
 }
 
diff --git a/src/gui-file.c b/src/gui-file.c
index d111f11..327a359 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -6,9 +6,6 @@
  *    Jon K Hellan (hellan acm org)
  *    Zbigniew Chyla (cyba gnome pl)
  *    Andreas J. Guelzow (aguelzow pyrshep ca)
- *
- * Port to Maemo:
- *	Eduardo Lima  (eduardo lima indt org br)
  */
 #include <gnumeric-config.h>
 #include <glib/gi18n-lib.h>
@@ -34,10 +31,6 @@
 #include <errno.h>
 #include <string.h>
 
-#ifdef GNM_USE_HILDON
-#include <hildon-fm/hildon-widgets/hildon-file-chooser-dialog.h>
-#endif
-
 typedef struct {
 	GOCharmapSel *go_charmap_sel;
 	GtkWidget	*charmap_label;
@@ -330,9 +323,6 @@ gui_file_open (WBCGtk *wbcg, file_open_t type, char const *default_format)
 	gtk_widget_set_sensitive (GTK_WIDGET (format_combo), opener_default == 0);
 	file_format_changed_cb (format_combo, &data);
 
-#ifdef GNM_USE_HILDON
-	fsel = GTK_FILE_CHOOSER (hildon_file_chooser_dialog_new (wbcg_toplevel (wbcg), GTK_FILE_CHOOSER_ACTION_OPEN));
-#else
 	fsel = GTK_FILE_CHOOSER
 		(g_object_new (GTK_TYPE_FILE_CHOOSER_DIALOG,
 			       "action", GTK_FILE_CHOOSER_ACTION_OPEN,
@@ -349,7 +339,6 @@ gui_file_open (WBCGtk *wbcg, file_open_t type, char const *default_format)
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_OPEN, GTK_RESPONSE_OK,
 				NULL);
-#endif
 	gtk_dialog_set_default_response (GTK_DIALOG (fsel), GTK_RESPONSE_OK);
 
 	/* Add Templates bookmark */
@@ -417,20 +406,11 @@ gui_file_open (WBCGtk *wbcg, file_open_t type, char const *default_format)
 		g_object_ref_sink (box);
 		g_object_set_data_full (G_OBJECT (advanced_button), "extra",
 					box, g_object_unref);
-#ifdef GNM_USE_HILDON
-		/*
-		 * Don't need to show the vbox. This is here just to avoid the warning :
-		 * GLIB WARNING ** default - hildon-file-chooser-dialog.c:1226: invalid
-		 * property id 4103 for "extra-widget" of type `GParamObject' in `HildonFileChooserDialog'
-		 */
-		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (fsel)->vbox), box, FALSE, TRUE, 6);
-#else
 		gtk_widget_show_all (box);
 		g_signal_connect (G_OBJECT (advanced_button),
 				  "clicked",
 				  G_CALLBACK (cb_advanced_clicked),
 				  fsel);
-#endif
 	}
 
 	/* Show file selector */
@@ -505,10 +485,8 @@ gui_file_save_as (WBCGtk *wbcg, WorkbookView *wb_view, file_save_as_t type,
 	char *uri;
 	Workbook *wb;
 	WBCGtk *wbcg2;
-#ifndef GNM_USE_HILDON
 	char const *title = (type == FILE_SAVE_AS_SAVE) ? _("Save the current workbook as")
 		: _("Export the current workbook or sheet to");
-#endif
 
 	g_return_val_if_fail (wbcg != NULL, FALSE);
 
@@ -537,9 +515,6 @@ gui_file_save_as (WBCGtk *wbcg, WorkbookView *wb_view, file_save_as_t type,
 	}
 	savers = g_list_sort (savers, file_saver_description_cmp);
 
-#ifdef GNM_USE_HILDON
-	fsel = GTK_FILE_CHOOSER (hildon_file_chooser_dialog_new (wbcg_toplevel (wbcg), GTK_FILE_CHOOSER_ACTION_SAVE));
-#else
 	fsel = GTK_FILE_CHOOSER
 		(g_object_new (GTK_TYPE_FILE_CHOOSER_DIALOG,
 			       "action", GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -550,7 +525,6 @@ gui_file_save_as (WBCGtk *wbcg, WorkbookView *wb_view, file_save_as_t type,
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				GTK_STOCK_SAVE, GTK_RESPONSE_OK,
 				NULL);
-#endif
 
 	gtk_dialog_set_default_response (GTK_DIALOG (fsel), GTK_RESPONSE_OK);
 
@@ -597,13 +571,8 @@ gui_file_save_as (WBCGtk *wbcg, WorkbookView *wb_view, file_save_as_t type,
 		gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (format_combo), FALSE, TRUE, 6);
 		gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (format_combo));
 
-#ifdef GNM_USE_HILDON
-		gtk_widget_show_all (box);
-		gtk_box_pack_start (GTK_BOX (GTK_DIALOG (fsel)->vbox), box, FALSE, TRUE, 6);
-#else
 		gtk_widget_show_all (box);
 		gtk_file_chooser_set_extra_widget (fsel, box);
-#endif
 	}
 
 	/* Set default file saver */
diff --git a/src/main-application.c b/src/main-application.c
index 5cbfb2e..96a4b19 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -46,10 +46,6 @@
 #include <string.h>
 #include <locale.h>
 
-#ifdef GNM_USE_HILDON
-#include <libosso.h>
-#endif
-
 static gboolean split_funcdocs = FALSE;
 static gboolean immediate_exit_flag = FALSE;
 static gboolean gnumeric_no_splash = FALSE;
@@ -239,10 +235,6 @@ main (int argc, char const **argv)
 	gboolean has_console;
 #endif
 
-#ifdef GNM_USE_HILDON
-	osso_context_t * osso_context;
-#endif
-
 	/* No code before here, we need to init threads */
 	argv = gnm_pre_parse_init (argc, argv);
 
@@ -266,10 +258,6 @@ main (int argc, char const **argv)
 	}
 #endif
 
-#ifdef GNM_USE_HILDON
-	osso_context = osso_initialize ("gnumeric", GNM_VERSION_FULL, TRUE, NULL);
-#endif
-
 	gnumeric_arg_parse (argc, (char **)argv);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	bind_textdomain_codeset (GETTEXT_PACKAGE "-functions", "UTF-8");
@@ -391,10 +379,6 @@ main (int argc, char const **argv)
 		g_slist_foreach (wbcgs_to_kill, (GFunc)cb_kill_wbcg, NULL);
 	}
 
-#ifdef GNM_USE_HILDON
-	osso_deinitialize (osso_context);
-#endif
-
 	g_slist_free (wbcgs_to_kill);
 	gnumeric_arg_shutdown ();
 	store_plugin_state ();
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index a6c08a2..2db27c1 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -2164,15 +2164,9 @@ static GtkActionEntry const semi_permanent_actions[] = {
 		G_CALLBACK (cb_workbook_attr) },
 };
 
-#ifdef GNM_USE_HILDON
-#define FULLSCREEN_ACCEL "F6"
-#define ZOOM_IN_ACCEL "F7"
-#define ZOOM_OUT_ACCEL "F8"
-#else
 #define FULLSCREEN_ACCEL "F11"
 #define ZOOM_IN_ACCEL NULL
 #define ZOOM_OUT_ACCEL NULL
-#endif
 
 static GtkActionEntry const actions[] = {
 /* File */
diff --git a/src/wbc-gtk-impl.h b/src/wbc-gtk-impl.h
index 7070786..71dec41 100644
--- a/src/wbc-gtk-impl.h
+++ b/src/wbc-gtk-impl.h
@@ -11,9 +11,6 @@
 
 #include <goffice/goffice.h>
 #include <gtk/gtk.h>
-#ifdef GNM_USE_HILDON
-#include <hildon-widgets/hildon-program.h>
-#endif
 
 G_BEGIN_DECLS
 
@@ -21,9 +18,6 @@ struct _WBCGtk {
 	WorkbookControl	base;
 
 	GtkWidget   *toplevel;
-#ifdef GNM_USE_HILDON
-	HildonProgram *hildon_prog;
-#endif
 
 	/* The area that contains the sheet and the sheet tabs.  */
 	GtkWidget   *notebook_area;
@@ -172,9 +166,7 @@ void	 wbc_gtk_markup_changer	(WBCGtk *wbcg);
 
 gboolean wbc_gtk_load_templates (WBCGtk *gtk);
 
-#ifndef HILDON
 	G_MODULE_EXPORT void set_uifilename (char const *name, GtkActionEntry const *actions, int nb);
-#endif
 
 G_END_DECLS
 
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 9a47b14..6ac84eb 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -19,9 +19,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
  * USA
- *
- * Port to Maemo:
- *	Eduardo Lima  (eduardo lima indt org br)
  */
 #include <gnumeric-config.h>
 #include "gnumeric.h"
@@ -71,11 +68,6 @@
 #include <errno.h>
 #include <string.h>
 
-#ifdef GNM_USE_HILDON
-#include <hildon-widgets/hildon-window.h>
-#include <hildon-widgets/hildon-program.h>
-#endif
-
 #define	SHEET_CONTROL_KEY "SheetControl"
 
 
@@ -95,11 +87,9 @@ enum {
 	TARGET_SHEET
 };
 
-#ifndef HILDON
 static char const *uifilename = NULL;
 static GtkActionEntry const *extra_actions = NULL;
 static int extra_actions_nb;
-#endif
 static guint wbc_gtk_signals[WBC_GTK_LAST_SIGNAL];
 static GObjectClass *parent_class = NULL;
 
@@ -123,7 +113,6 @@ wbcg_ui_update_end (WBCGtk *wbcg)
 
 /****************************************************************************/
 
-#ifndef HILDON
 G_MODULE_EXPORT void
 set_uifilename (char const *name, GtkActionEntry const *actions, int nb)
 {
@@ -131,7 +120,6 @@ set_uifilename (char const *name, GtkActionEntry const *actions, int nb)
 	extra_actions = actions;
 	extra_actions_nb = nb;
 }
-#endif
 
 static void
 wbc_gtk_set_action_sensitivity (WBCGtk const *wbcg,
@@ -166,10 +154,6 @@ wbc_gtk_set_action_label (WBCGtk const *wbcg,
 		char *text;
 		gboolean is_suffix = (suffix != NULL);
 
-#ifdef GNM_USE_HILDON
-		wbc_gtk_hildon_set_action_sensitive (wbcg, action, is_suffix);
-#endif
-
 		text = is_suffix ? g_strdup_printf ("%s: %s", prefix, suffix) : (char *) prefix;
 		g_object_set (G_OBJECT (a),
 			      "label",	   text,
@@ -1030,42 +1014,9 @@ wbc_gtk_create_notebook_area (WBCGtk *wbcg)
 			  GTK_FILL | GTK_EXPAND | GTK_SHRINK,
 			  0, 0);
 
-#ifdef GNM_USE_HILDON
-	gtk_notebook_set_show_border (wbcg->notebook, FALSE);
-	gtk_notebook_set_show_tabs (wbcg->notebook, FALSE);
-#endif
 }
 
 
-#ifdef GNM_USE_HILDON
-static void
-wbc_gtk_hildon_set_action_sensitive (WBCGtk      *wbcg,
-				     const gchar *action,
-				     gboolean     sensitive)
-{
-	GtkWidget * toolbar = gtk_ui_manager_get_widget (wbcg->ui, "/StandardToolbar");
-	GList * children = gtk_container_get_children (GTK_CONTAINER (toolbar));
-	GList * l;
-
-	for (l = children; l != NULL; l = g_list_next (l)) {
-		if (GTK_IS_SEPARATOR_TOOL_ITEM (l->data) == FALSE) {
-			gchar * label = NULL;
-			g_object_get (GTK_TOOL_ITEM (l->data), "label", &label, NULL);
-
-			if (label != NULL && strstr (label, action) != NULL) {
-				g_object_set (G_OBJECT (l->data), "sensitive", sensitive, NULL);
-				g_free(label);
-				break;
-			}
-
-			g_free(label);
-		}
-	}
-
-	g_list_free (children);
-}
-#endif
-
 static void
 wbcg_menu_state_sheet_count (WBCGtk *wbcg)
 {
@@ -3015,13 +2966,7 @@ wbc_gtk_init_zoom (WBCGtk *wbcg)
 			      "tooltip", _("Zoom"),
 			      "stock-id", GTK_STOCK_ZOOM_IN,
 			      NULL);
-	go_action_combo_text_set_width (wbcg->zoom_haction,
-#ifdef GNM_USE_HILDON
-					"100000000%"
-#else
-					"10000%"
-#endif
-					);
+	go_action_combo_text_set_width (wbcg->zoom_haction, "10000%");
 	for (i = 0; preset_zoom[i] != NULL ; ++i)
 		go_action_combo_text_add_item (wbcg->zoom_haction,
 					       preset_zoom[i]);
@@ -3488,11 +3433,7 @@ wbc_gtk_init_font_size (WBCGtk *gtk)
 		g_free (size_text);
 	}
 	g_slist_free (font_sizes);
-#ifdef GNM_USE_HILDON
-	go_action_combo_text_set_width (gtk->font_size,  "888888");
-#else
 	go_action_combo_text_set_width (gtk->font_size, "888");
-#endif
 	g_signal_connect (G_OBJECT (gtk->font_size),
 		"activate",
 		G_CALLBACK (cb_font_size_changed), gtk);
@@ -3799,12 +3740,8 @@ cb_regenerate_window_menu (WBCGtk *gtk)
 	while (i-- > 1) {
 		char *name = g_strdup_printf ("WindowListEntry%d", i);
 		gtk_ui_manager_add_ui (gtk->ui, gtk->windows.merge_id,
-#ifdef GNM_USE_HILDON
-			"/popup/View/Windows",
-#else
-			"/menubar/View/Windows",
-#endif
-			name, name, GTK_UI_MANAGER_AUTO, TRUE);
+			"/menubar/View/Windows", name, name,
+			GTK_UI_MANAGER_AUTO, TRUE);
 		g_free (name);
 	}
 }
@@ -4146,12 +4083,6 @@ cb_add_menus_toolbars (G_GNUC_UNUSED GtkUIManager *ui,
 		GtkWidget *vw;
 		const struct ToolbarInfo *ti;
 
-#ifdef GNM_USE_HILDON
-		hildon_window_add_toolbar (HILDON_WINDOW (wbcg_toplevel (wbcg)), GTK_TOOLBAR (w));
-
-		gtk_widget_show_all (w);
-		vw = w;
-#else
 		GtkWidget *box;
 		GtkPositionType pos = gnm_conf_get_toolbar_position (name);
 
@@ -4189,7 +4120,6 @@ cb_add_menus_toolbars (G_GNUC_UNUSED GtkUIManager *ui,
 					(GDestroyNotify)g_free);
 
 		vw = box;
-#endif
 		g_hash_table_insert (wbcg->visibility_widgets,
 				     g_strdup (toggle_name),
 				     g_object_ref (vw));
@@ -4218,12 +4148,8 @@ cb_add_menus_toolbars (G_GNUC_UNUSED GtkUIManager *ui,
 		g_object_set_data (G_OBJECT (box), "toggle_action",
 			gtk_action_group_get_action (gtk->toolbar.actions, toggle_name));
 		gtk_ui_manager_add_ui (gtk->ui, gtk->toolbar.merge_id,
-#ifdef GNM_USE_HILDON
-			"/popup/View/Toolbars",
-#else
-			"/menubar/View/Toolbars",
-#endif
-			toggle_name, toggle_name, GTK_UI_MANAGER_AUTO, FALSE);
+			"/menubar/View/Toolbars", toggle_name, toggle_name,
+			GTK_UI_MANAGER_AUTO, FALSE);
 		wbcg->hide_for_fullscreen =
 			g_slist_prepend (wbcg->hide_for_fullscreen,
 					 gtk_action_group_get_action (gtk->toolbar.actions,
@@ -4868,14 +4794,10 @@ wbc_gtk_create_status_area (WBCGtk *wbcg)
 			     g_strdup ("ViewStatusbar"),
 			     g_object_ref (wbcg->status_area));
 
-#ifdef GNM_USE_HILDON
-	gtk_widget_hide (wbcg->status_area);
-#else
 	/* disable statusbar by default going to fullscreen */
 	wbcg->hide_for_fullscreen =
 		g_slist_prepend (wbcg->hide_for_fullscreen,
 				 gtk_action_group_get_action (wbcg->actions, "ViewStatusbar"));
-#endif
 }
 
 /****************************************************************************/
@@ -4943,12 +4865,8 @@ wbc_gtk_reload_recent_file_menu (WBCGtk const *wbcg)
 	while (i-- > 1) {
 		char *name = g_strdup_printf ("FileHistoryEntry%d", i);
 		gtk_ui_manager_add_ui (gtk->ui, gtk->file_history.merge_id,
-#ifdef GNM_USE_HILDON
-			"/popup/File/FileHistory",
-#else
-			"/menubar/File/FileHistory",
-#endif
-			name, name, GTK_UI_MANAGER_AUTO, TRUE);
+			"/menubar/File/FileHistory", name, name,
+			GTK_UI_MANAGER_AUTO, TRUE);
 		g_free (name);
 	}
 }
@@ -5062,13 +4980,7 @@ wbc_gtk_reload_templates (WBCGtk *gtk)
 			g_strdup (uri), (GDestroyNotify)g_free);
 
 
-		gpath =
-#ifdef GNM_USE_HILDON
-			"/popup/File/Templates"
-#else
-			"/menubar/File/Templates"
-#endif
-			;
+		gpath = "/menubar/File/Templates";
 		gtk_ui_manager_add_ui (gtk->ui, gtk->templates.merge_id,
 				       gpath, gname, gname,
 				       GTK_UI_MANAGER_AUTO, FALSE);
@@ -5281,10 +5193,6 @@ wbc_gtk_finalize (GObject *obj)
 	wbcg->hide_for_fullscreen = NULL;
 
 
-#ifdef GNM_USE_HILDON
-	UNREF_OBJ (hildon_prog);
-#endif
-
 	g_free (wbcg->preferred_geometry);
 	wbcg->preferred_geometry = NULL;
 
@@ -5699,10 +5607,6 @@ wbc_gtk_init (GObject *obj)
 	char		*uifile;
 	unsigned	 i;
 
-#ifdef GNM_USE_HILDON
-	static HildonProgram *hildon_program = NULL;
-#endif
-
 	wbcg->table       = gtk_table_new (0, 0, 0);
 	wbcg->bnotebook   = NULL;
 	wbcg->snotebook   = NULL;
@@ -5738,30 +5642,16 @@ wbc_gtk_init (GObject *obj)
 
 	wbcg->idle_update_style_feedback = 0;
 
-#ifdef GNM_USE_HILDON
-	if (hildon_program == NULL)
-		hildon_program = HILDON_PROGRAM (hildon_program_get_instance ());
-	else
-		g_object_ref (hildon_program);
-
-	wbcg->hildon_prog = hildon_program;
-
-	wbcg_set_toplevel (wbcg, hildon_window_new ());
-	hildon_program_add_window (wbcg->hildon_prog, HILDON_WINDOW (wbcg_toplevel (wbcg)));
-#else
 	wbcg_set_toplevel (wbcg, gtk_window_new (GTK_WINDOW_TOPLEVEL));
-#endif
 
 	g_signal_connect (wbcg_toplevel (wbcg), "window_state_event",
 			  G_CALLBACK (cb_wbcg_window_state_event),
 			  wbcg);
 
-#ifndef GNM_USE_HILDON
 	gtk_box_pack_start (GTK_BOX (wbcg->everything),
 		wbcg->menu_zone, FALSE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (wbcg->everything),
 		wbcg->toolbar_zones[GTK_POS_TOP], FALSE, TRUE, 0);
-#endif
 
 	gtk_window_set_title (wbcg_toplevel (wbcg), "Gnumeric");
 	gtk_window_set_wmclass (wbcg_toplevel (wbcg), "Gnumeric", "Gnumeric");
@@ -5806,16 +5696,12 @@ wbc_gtk_init (GObject *obj)
 	gtk_window_add_accel_group (wbcg_toplevel (wbcg),
 		gtk_ui_manager_get_accel_group (wbcg->ui));
 
-#ifdef GNM_USE_HILDON
-	uifile = g_build_filename (gnm_sys_data_dir (), "HILDON_Gnumeric-gtk.xml", NULL);
-#else
 	if (extra_actions)
 		gtk_action_group_add_actions (wbcg->actions, extra_actions,
 			                      extra_actions_nb, wbcg);
 
 	uifile = g_build_filename (gnm_sys_data_dir (),
 		(uifilename? uifilename: "GNOME_Gnumeric-gtk.xml"), NULL);
-#endif
 
 	if (!gtk_ui_manager_add_ui_from_file (wbcg->ui, uifile, &error)) {
 		g_message ("building menus failed: %s", error->message);
@@ -5864,18 +5750,6 @@ wbc_gtk_init (GObject *obj)
 				       (gpointer)"");
 	}
 
-#ifdef GNM_USE_HILDON
-	hildon_window_set_menu (HILDON_WINDOW (wbcg_toplevel (wbcg)),
-				GTK_MENU (gtk_ui_manager_get_widget (wbcg->ui, "/popup")));
-
-	gtk_widget_show_all (wbcg->toplevel);
-
-	wbc_gtk_set_toggle_action_state (wbcg, "ViewMenuToolbarFormatToolbar", FALSE);
-	wbc_gtk_set_toggle_action_state (wbcg, "ViewMenuToolbarObjectToolbar", FALSE);
-	wbc_gtk_set_toggle_action_state (wbcg, "ViewSheets", FALSE);
-	wbc_gtk_set_toggle_action_state (wbcg, "ViewStatusbar", FALSE);
-#endif
-
 	wbcg_set_autosave_time (wbcg, gnm_conf_get_core_workbook_autosave_time ());
 
 #ifndef GNM_ENABLE_SOLVER
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 92af1cc..4b7012e 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -1460,10 +1460,6 @@ gee_init (GnmExprEntry *gee)
 
 	gee->entry = GTK_ENTRY (gtk_entry_new ());
 
-#ifdef GNM_USE_HILDON
-	g_object_set (G_OBJECT (gee->entry), "autocap", FALSE, NULL);
-#endif
-
 	/* Disable selecting the entire content when the widget gets focus */
 	g_object_set (gtk_widget_get_settings (GTK_WIDGET (gee->entry)),
 		      "gtk-entry-select-on-focus", FALSE,
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]