Commit 63b71a7b authored by Adrian Bunk's avatar Adrian Bunk Committed by Morten Welinder

Remove the obsolete Hildon port

The GTK+ based Hildon is not likely to ever be ported to GTK+ 3.
parent da151702
......@@ -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$])
......
......@@ -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 */
......
......@@ -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
......
......@@ -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
......
......@@ -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
<?xml version="1.0" encoding="UTF-8"?>
<ui>
<popup>
<menu name="File" action="MenuFile">
<menuitem action="FileNew"/>
<menuitem action="FileOpen"/>
<separator name="file-sep1"/>
<menuitem action="FileSave"/>
<menuitem action="FileSaveAs"/>
<separator name="file-sep2"/>
<menu name="Print Area" action="FilePrintArea">
<menuitem action="FilePrintAreaSet"/>
<menuitem action="FilePrintAreaClear"/>
<menuitem action="FilePrintAreaShow"/>
<menuitem action="FilePrintAreaToggleColPageBreak"/>
<menuitem action="FilePrintAreaToggleRowPageBreak"/>
<menuitem action="FilePrintAreaClearAllPageBreak"/>
</menu>
<!--
<menuitem action="FilePageSetup"/>
<menuitem action="FilePrintPreview"/>
<menuitem action="FilePrint"/>
<separator name="file-sep3"/>
-->
<menuitem action="FileSend"/>
<menuitem action="FileMetaData"/>
<separator name="file-sep4"/>
<placeholder name="FileHistory" />
<separator name="file-sep5"/>
<menuitem action="FileClose"/>
<menuitem action="FileQuit"/>
</menu>
<menu name="Edit" action="MenuEdit">
<menuitem action="Undo"/>
<menuitem action="Redo"/>
<separator name="edit-sep1"/>
<menuitem action="EditCut"/>
<menuitem action="EditCopy"/>
<menuitem action="EditPaste"/>
<menuitem action="EditPasteSpecial"/>
<!--TODO menuitem action="EditPasteLink" -->
<separator name="edit-sep2"/>
<menu name="Fill" action="MenuEditFill">
<menuitem action="EditFillAutofill"/>
<menuitem action="ToolsMerge"/>
<menuitem action="ToolsTabulate"/>
<menuitem action="EditFillSeries"/>
<menu name="RandomGenerator" action="MenuRandomGenerator">
<menuitem action="RandomGeneratorUncorrelated"/>
<menuitem action="RandomGeneratorCorrelated"/>
</menu>
<menuitem action="CopyDown"/>
<menuitem action="CopyRight"/>
</menu>
<menu name="Clear" action="MenuEditClear">
<menuitem action="EditClearAll"/>
<menuitem action="EditClearFormats"/>
<menuitem action="EditClearComments"/>
<menuitem action="EditClearContent"/>
<separator name="clear-sep1"/>
<menuitem action="EditClearAllFiltered"/>
<menuitem action="EditClearFormatsFiltered"/>
<menuitem action="EditClearCommentsFiltered"/>
<menuitem action="EditClearContentFiltered"/>
</menu>
<menu name="Delete" action="MenuEditDelete">
<menuitem action="EditDeleteColumns"/>
<menuitem action="EditDeleteRows"/>
<menuitem action="EditDeleteCells"/>
<menuitem action="EditClearComments"/>
<menuitem action="EditClearHyperLinks"/>
</menu>
<menu name="EditItems" action="MenuEditItems">
<menuitem action="EditComment"/>
<menuitem action="EditHyperlink"/>
<menuitem action="EditNames"/>
</menu>
<separator name="edit-sep3"/>
<menuitem action="EditFind"/>
<menuitem action="EditReplace"/>
<menuitem action="EditGotoTop"/>
<menuitem action="EditGotoBottom"/>
<menuitem action="EditGotoFirst"/>
<menuitem action="EditGotoLast"/>
<menuitem action="EditGoto"/>
<separator name="edit-sep4"/>
<menu name="EditSheet" action="MenuEditSheet">
<menuitem action="SheetReorder"/>
<separator/>
<menuitem action="InsertSheet"/>
<menuitem action="InsertSheetAtEnd"/>
<menuitem action="EditDuplicateSheet"/>
<menuitem action="SheetRemove"/>
<menuitem action="SheetChangeName"/>
</menu>
<menu name="Select" action="MenuEditSelect">
<menuitem action="EditSelectAll"/>
<menuitem action="EditSelectColumn"/>
<menuitem action="EditSelectRow"/>
<menuitem action="EditSelectArray"/>
<menuitem action="EditSelectDepends"/>
<menuitem action="EditSelectInputs"/>
<menuitem action="EditSelectObject"/>
</menu>
<menuitem action="EditRecalc"/>
<placeholder name="ops"/>
<menuitem action="EditPreferences"/>
</menu>
<menu name="View" action="MenuView">
<menuitem action="ViewNew"/>
<menuitem action="ViewFreezeThawPanes"/>
<menu name="Windows" action="MenuViewWindows">
</menu>
<separator/>
<menu name="Toolbars" action="MenuViewToolbars">
</menu>
<menuitem action="ViewStatusbar"/>
<menuitem action="ViewFullScreen"/>
<menuitem action="FormatWorkbook"/>
<separator/>
<menuitem action="ViewZoom"/>
<menuitem action="ViewZoomIn"/>
<menuitem action="ViewZoomOut"/>
</menu>
<menu name="Insert" action="MenuInsert">
<menuitem action="InsertCells"/>
<menuitem action="InsertColumns"/>
<menuitem action="InsertRows"/>
<menuitem action="SheetInsert"/>
<separator/>
<menuitem action="ChartGuru"/>
<!-- These don't work yet for Gnome 2
<menuitem action="InsertComponent" />
<menuitem action="InsertShapedComponent" />
<separator/>
-->
<menuitem action="InsertImage"/>
<menuitem action="InsertFormula"/>
<menu name="InsertFormulaWrap" action="MenuInsertFormulaWrap">
<menuitem action="InsertSortDecreasing"/>
<menuitem action="InsertSortIncreasing"/>
</menu>
<menuitem action="InsertNames"/>
<menuitem action="InsertComment"/>
<menuitem action="InsertHyperlink"/>
<menu name="Special" action="MenuInsertSpecial">
<menuitem action="InsertCurrentDate"/>
<menuitem action="InsertCurrentTime"/>
<menuitem action="InsertCurrentDateTime"/>
</menu>
</menu>
<menu name="Format" action="MenuFormat">
<menu name="FormatCellsMenu" action="MenuFormatCells">
<menuitem action="FormatCells"/>
<menuitem action="FormatCellsCond"/>
<menuitem action="FormatMergeCells"/>
<menuitem action="FormatUnmergeCells"/>
<menuitem action="FormatCellsFitHeight"/>
<menuitem action="FormatCellsFitWidth"/>
</menu>
<menu name="FormatColumn" action="MenuFormatColumn">
<menuitem action="ColumnSize"/>
<menuitem action="ColumnAutoSize"/>
<menuitem action="ColumnHide"/>
<menuitem action="ColumnUnhide"/>
<menuitem action="ColumnDefaultSize"/>
</menu>
<menu name="FormatRow" action="MenuFormatRow">
<menuitem action="RowSize"/>
<menuitem action="RowAutoSize"/>
<menuitem action="RowHide"/>
<menuitem action="RowUnhide"/>
<menuitem action="RowDefaultSize"/>
</menu>
<menu name="FormatSheets" action="MenuFormatSheet">
<menuitem action="SheetReorder"/>
<menuitem action="SheetChangeName"/>
<separator/>
<menuitem action="SheetDisplayFormulas"/>
<menuitem action="SheetUseR1C1"/>
<menuitem action="SheetHideZeros"/>
<menuitem action="SheetHideGridlines"/>
<menuitem action="SheetHideColHeader"/>
<menuitem action="SheetHideRowHeader"/>
<separator/>
<menuitem action="ViewZoom"/>
</menu>
<menuitem action="FormatAuto"/>
</menu>
<menu name="Tools" action="MenuTools">
<menuitem action="ToolsPlugins"/>
<separator name="tools-sep1"/>
<menuitem action="ToolsAutoCorrect"/>
<menuitem action="ToolsAutoSave"/>
<separator name="tools-sep2"/>
<menuitem action="ToolsGoalSeek"/>
<menuitem action="ToolsSolver"/>
<menu name="Scenarios" action="MenuToolsScenarios">
<menuitem action="ToolsScenarios"/>
<menuitem action="ToolsScenarioAdd"/>
</menu>
<menuitem action="ToolsSimulation"/>
</menu>
<menu name="Statistics" action="MenuStatistics">
<menu name="StatisticsDescriptive" action="MenuStatisticsDescriptive">
<menuitem action="ToolsCorrelation"/>
<menuitem action="ToolsCovariance"/>
<menuitem action="ToolsDescStatistics"/>
<menu name="ToolFrequencies" action="MenuToolFrequencies">
<menuitem action="ToolsFrequency"/>
<menuitem action="ToolsHistogram"/>
</menu>
<menuitem action="ToolsRanking"/>
</menu>
<menuitem action="ToolsSampling"/>
<menu name="StatisticsTimeSeries" action="MenuStatisticsTimeSeries">
<menu name="ToolForecast" action="MenuToolForecast">
<menuitem action="ToolsExpSmoothing"/>
<menuitem action="ToolsAverage"/>
</menu>
<menuitem action="ToolsFourier"/>
<menuitem action="ToolsKaplanMeier"/>
<menuitem action="ToolsPrincipalComponents"/>
<menuitem action="ToolsRegression"/>
</menu>
<separator/>
<menu name="StatisticsOneSample" action="MenuStatisticsOneSample">
<menuitem action="ToolsNormalityTests"/>
<menu name="ToolOneMedian" action="MenuToolOneMedian">
<menuitem action="ToolsOneMedianSignTest"/>
<menuitem action="ToolsOneMedianWilcoxonSignedRank"/>
</menu>
</menu>
<menu name="StatisticsTwoSamples" action="MenuStatisticsTwoSamples">
<menu name="ToolTTest" action="MenuToolTTest">
<menuitem action="ToolTTestPaired"/>
<menuitem action="ToolTTestEqualVar"/>
<menuitem action="ToolTTestUnequalVar"/>
<menuitem action="ToolZTest"/>
</menu>
<menu name="ToolTwoMedians" action="MenuToolTwoMedians">
<menuitem action="ToolsTwoMedianSignTest"/>
<menuitem action="ToolsTwoMedianWilcoxonSignedRank"/>
<menuitem action="ToolsTwoMedianWilcoxonMannWhitney"/>
</menu>
<menuitem action="ToolsFTest"/>
</menu>
<menu name="StatisticsMultipleSamples" action="MenuStatisticsMultipleSamples">
<menu name="ANOVA" action="MenuANOVA">
<menuitem action="ToolsANOVAoneFactor"/>
<menuitem action="ToolsANOVAtwoFactor"/>
</menu>
<menu name="ChiSquareTests" action="MenuContingencyTests">
<menuitem action="ToolsHomogeneity"/>
<menuitem action="ToolsIndependence"/>
</menu>
</menu>
</menu>
<menu name="Data" action="MenuData">
<menuitem action="DataSort"/>
<menu name="Filter" action="MenuFilter">
<menuitem action="DataAutoFilter"/>
<menuitem action="DataFilterShowAll"/>
<menuitem action="DataFilterAdvancedfilter"/>
</menu>
<menuitem action="DataValidate"/>
<separator/>
<menuitem action="DataTextToColumns"/>
<menuitem action="DataConsolidate"/>
<menu name="Outline" action="MenuOutline">
<menuitem action="DataOutlineHideDetail"/>
<menuitem action="DataOutlineShowDetail"/>
<menuitem action="DataOutlineGroup"/>
<menuitem action="DataOutlineUngroup"/>
<separator/>
<menuitem action="SheetDisplayOutlines"/>
<menuitem action="SheetOutlineBelow"/>
<menuitem action="SheetOutlineRight"/>
</menu>
<!--
<menuitem action="PivotTable" />
-->
<menu name="ExternalData" action="MenuExternalData">
<menuitem action="DataImportText"/>
<menuitem action="DataImportOther"/>
</menu>
<menu name="ExportData" action="MenuExportData">
<menuitem action="DataExportText"/>
<menuitem action="DataExportCSV"/>
<menuitem action="DataExport"/>
</menu>
</menu>
<menu name="Help" action="MenuHelp">
<!--
<menuitem action="HelpDocs"/>
-->
<menuitem action="HelpFunctions"/>
<!--
<menuitem action="HelpWeb"/>
<menuitem action="HelpIRC"/>
<menuitem action="HelpBug"/>
<separator/>
-->
<menuitem action="HelpAbout"/>
</menu>
</popup>
<toolbar _name="StandardToolbar">
<toolitem action="FileNew"/>
<toolitem action="FileOpen"/>
<toolitem action="FileSave"/>
<separator name="std-sep1"/>
<!--
<toolitem action="FilePrint"/>
<toolitem action="FilePrintPreview"/>
<separator name="std-sep2"/>
-->
<toolitem action="EditCut"/>
<toolitem action="EditCopy"/>
<toolitem action="EditPaste"/>
<separator name="std-sep3"/>
<toolitem action="UndoLast"/>
<toolitem action="RedoLast"/>
<separator name="std-sep4"/>
<toolitem action="InsertHyperlink"/>
<toolitem action="AutoSum"/>
<toolitem action="InsertFormula"/>
<toolitem action="SortAscending"/>
<toolitem action="SortDescending"/>
<separator name="std-sep5"/>
<toolitem action="ChartGuru" />
<toolitem action="Zoom"/>
<toolitem action="Direction"/>
</toolbar>
<toolbar _name="FormatToolbar">
<toolitem action="FontName"/>
<toolitem action="FontSize"/>
<toolitem action="FontBold"/>
<toolitem action="FontItalic"/>
<toolitem action="FontUnderline"/>
<separator name="fmt-sep1"/>
<toolitem action="AlignLeft"/>
<toolitem action="AlignCenter"/>
<toolitem action="AlignRight"/>
<toolitem action="CenterAcrossSelection"/>
<toolitem action="FormatMergeCells"/>
<toolitem action="FormatUnmergeCells"/>
<separator name="fmt-sep2"/>
<toolitem action="FormatAsAccounting"/>
<toolitem action="FormatAsPercentage"/>
<toolitem action="FormatWithThousands"/>
<toolitem action="FormatIncreasePrecision"/>
<toolitem action="FormatDecreasePrecision"/>
<separator name="fmt-sep3"/>
<toolitem action="FormatDecreaseIndent"/>
<toolitem action="FormatIncreaseIndent"/>
<separator name="fmt-sep4"/>
<toolitem action="BorderSelector"/>
<toolitem action="ColorBack"/>
<toolitem action="ColorFore"/>
</toolbar>
<toolbar _name="ObjectToolbar">
<toolitem action="CreateRectangle"/>
<toolitem action="CreateEllipse"/>
<toolitem action="CreateFrame"/>
<toolitem action="CreateLine"/>
<toolitem action="CreateArrow"/>
<toolitem action="CreateCheckbox"/>
<toolitem action="CreateRadioButton"/>
<toolitem action="CreateButton"/>
<toolitem action="CreateScrollbar"/>
<toolitem action="CreateSpinButton"/>
<toolitem action="CreateSlider"/>
<toolitem action="CreateList"/>
<toolitem action="CreateCombo"/>
</toolbar>
<accelerator name="CopyRight" action="CopyRight"/>
<accelerator name="CopyDown" action="CopyDown"/>
<accelerator name="FontBold" action="FontBold"/>
<accelerator name="FontItalic" action="FontItalic"/>
<accelerator name="FontUnderline" action="FontUnderline"/>
<accelerator name="FontDoubleUnderline" action="FontDoubleUnderline"/>
<accelerator name="FontSuperscript" action="FontSuperscript"/>
<accelerator name="FontSubscript" action="FontSubscript"/>
<accelerator name="FontStrikeThrough" action="FontStrikeThrough"/>
<accelerator name="FormatAsNumber" action="FormatAsNumber"/>
<accelerator name="FormatAsCurrency" action="FormatAsCurrency"/>
<accelerator name="FormatAsGeneral" action="FormatAsGeneral"/>
<accelerator name="FormatAsPercentage" action="FormatAsPercentage"/>
<accelerator name="FormatAsScientific" action="FormatAsScientific"/>
<accelerator name="FormatAsDate" action="FormatAsDate"/>
<accelerator name="FormatAsTime" action="FormatAsTime"/>
<accelerator name="FormatAddBorders" action="FormatAddBorders"/>
<accelerator name="FormatClearBorders" action="FormatClearBorders"/>
<accelerator name="Repeat" action="Repeat"/>
</ui>
......@@ -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
......@@ -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);
}
......
......@@ -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 */
......
......@@ -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 ();
......
......@@ -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 */
......