Commit f4915422 authored by Morten Welinder's avatar Morten Welinder

Namespace

parent 07c591e1
......@@ -547,7 +547,7 @@ go_plugin_shutdown (GOPlugin *plugin, GOCmdContext *cc)
cnc_hash = NULL;
}
ModulePluginUIActions const gdaif_ui_actions[] = {
GnmModulePluginUIActions const gdaif_ui_actions[] = {
{"ViewDataSources", view_data_sources},
{NULL}
};
......
......@@ -25,7 +25,7 @@ view_data_sources (GnmAction const *action, WorkbookControl *wbc)
}
}
ModulePluginUIActions const gnome_db_ui_actions[] = {
GnmModulePluginUIActions const gnome_db_ui_actions[] = {
{"ViewDataSources", view_data_sources},
{NULL}
};
......@@ -317,7 +317,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
GOPluginService *service,
GOErrorInfo **ret_error)
{
PluginServiceFunctionGroupCallbacks *cbs;
GnmPluginServiceFunctionGroupCallbacks *cbs;
g_return_if_fail (GNM_IS_PLUGIN_SERVICE_FUNCTION_GROUP (service));
......
......@@ -24,7 +24,7 @@ python_get_loader_type (GOErrorInfo **ret_error)
return TYPE_GNM_PYTHON_PLUGIN_LOADER;
}
ModulePluginUIActions const console_ui_actions[] = {
GnmModulePluginUIActions const console_ui_actions[] = {
{ "ShowConsole", show_python_console },
{ NULL }
};
......
......@@ -723,7 +723,7 @@ gplp_load_service_function_group (GOPluginLoader *loader,
fn_info_dict_name);
gnm_python_clear_error_if_needed (loader_python->py_object);
if (python_fn_info_dict != NULL && PyDict_Check (python_fn_info_dict)) {
PluginServiceFunctionGroupCallbacks *cbs;
GnmPluginServiceFunctionGroupCallbacks *cbs;
ServiceLoaderDataFunctionGroup *loader_data;
cbs = go_plugin_service_get_cbs (service);
......@@ -835,7 +835,7 @@ gplp_load_service_ui (GOPluginLoader *loader,
ui_action_names);
gnm_python_clear_error_if_needed (loader_python->py_object);
if (ui_actions != NULL && PyDict_Check (ui_actions)) {
PluginServiceUICallbacks *cbs;
GnmPluginServiceUICallbacks *cbs;
ServiceLoaderDataUI *loader_data;
cbs = go_plugin_service_get_cbs (service);
......
......@@ -36,7 +36,7 @@ hello_message (GnmAction const *action, WorkbookControl *wbc)
g_free (msg);
}
ModulePluginUIActions const hello_ui_actions[] = {
GnmModulePluginUIActions const hello_ui_actions[] = {
{ "HelloMenu", NULL },
{ "HelloWorld", hello_message },
{ NULL }
......
......@@ -90,7 +90,7 @@ dialog_tool_init_outputs (GenericToolState *state, GCallback sensitivity_cb)
g_signal_connect_after (G_OBJECT (state->gdao),
"readiness-changed",
G_CALLBACK (sensitivity_cb), state);
gnumeric_editable_enters (GTK_WINDOW (state->dialog),
gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->gdao));
return;
......
......@@ -533,7 +533,7 @@ dialog_about (WBCGtk *wbcg)
GList *children;
AboutState *state;
if (gnumeric_dialog_raise_if_exists (wbcg, ABOUT_KEY))
if (gnm_dialog_raise_if_exists (wbcg, ABOUT_KEY))
return;
state = g_new0 (AboutState, 1);
......@@ -580,6 +580,6 @@ dialog_about (WBCGtk *wbcg)
}
g_list_free (children);
gnumeric_keyed_dialog (wbcg, GTK_WINDOW (w), ABOUT_KEY);
gnm_keyed_dialog (wbcg, GTK_WINDOW (w), ABOUT_KEY);
gtk_widget_show_all (w);
}
......@@ -199,7 +199,7 @@ dialog_advanced_filter (WBCGtk *wbcg)
wbc = GNM_WBC (wbcg);
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, ADVANCED_FILTER_KEY))
if (gnm_dialog_raise_if_exists (wbcg, ADVANCED_FILTER_KEY))
return;
state = g_new (AdvancedFilterState, 1);
......
......@@ -207,7 +207,7 @@ dialog_chi_square_tool (WBCGtk *wbcg, Sheet *sheet, gboolean independence)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, CHI_SQUARED_I_KEY))
if (gnm_dialog_raise_if_exists (wbcg, CHI_SQUARED_I_KEY))
return 0;
state = g_new0 (ChiSquaredIToolState, 1);
......
......@@ -248,7 +248,7 @@ dialog_frequency_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, FREQUENCY_KEY))
if (gnm_dialog_raise_if_exists (wbcg, FREQUENCY_KEY))
return 0;
state = g_new0 (FrequencyToolState, 1);
......
......@@ -616,7 +616,7 @@ dialog_kaplan_meier_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, KAPLAN_MEIER_KEY))
if (gnm_dialog_raise_if_exists (wbcg, KAPLAN_MEIER_KEY))
return 0;
state = g_new0 (KaplanMeierToolState, 1);
......@@ -726,7 +726,7 @@ dialog_kaplan_meier_tool (WBCGtk *wbcg, Sheet *sheet)
"focus-in-event",
G_CALLBACK (kaplan_meier_tool_set_groups_cb), state);
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->groups_input));
widget = go_gtk_builder_get_widget (state->base.gui, "groups-label");
......
......@@ -191,7 +191,7 @@ dialog_normality_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, NORMALITY_KEY))
if (gnm_dialog_raise_if_exists (wbcg, NORMALITY_KEY))
return 0;
state = g_new0 (NormalityTestsToolState, 1);
......
......@@ -214,7 +214,7 @@ dialog_one_mean_test_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, ONE_MEAN_TEST_KEY))
if (gnm_dialog_raise_if_exists (wbcg, ONE_MEAN_TEST_KEY))
return 0;
state = g_new0 (OneeMeanTestToolState, 1);
......
......@@ -161,7 +161,7 @@ dialog_principal_components_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, PRINCIPAL_COMPONENTS_KEY))
if (gnm_dialog_raise_if_exists (wbcg, PRINCIPAL_COMPONENTS_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
......
......@@ -247,7 +247,7 @@ dialog_sign_test_two_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, SIGN_TEST_KEY_TWO))
if (gnm_dialog_raise_if_exists (wbcg, SIGN_TEST_KEY_TWO))
return 0;
state = g_new0 (SignTestToolState, 1);
......@@ -395,7 +395,7 @@ dialog_sign_test_tool (WBCGtk *wbcg, Sheet *sheet, signtest_type type)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, SIGN_TEST_KEY_ONE))
if (gnm_dialog_raise_if_exists (wbcg, SIGN_TEST_KEY_ONE))
return 0;
state = g_new0 (SignTestToolState, 1);
......
......@@ -178,7 +178,7 @@ dialog_wilcoxon_m_w_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, WILCOXON_MANN_WHITNEY_KEY))
if (gnm_dialog_raise_if_exists (wbcg, WILCOXON_MANN_WHITNEY_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
......
......@@ -352,7 +352,7 @@ dialog_tool_init_buttons (GenericToolState *state,
G_CALLBACK (ok_function), state);
state->help_button = go_gtk_builder_get_widget (state->gui, "helpbutton");
if (state->help_button != NULL )
gnumeric_init_help_button (state->help_button,
gnm_init_help_button (state->help_button,
state->help_link);
}
......@@ -431,7 +431,7 @@ dialog_tool_init (GenericToolState *state,
g_signal_connect_after (G_OBJECT (state->input_entry),
"changed",
G_CALLBACK (sensitivity_cb), state);
gnumeric_editable_enters (GTK_WINDOW (state->dialog),
gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->input_entry));
gtk_label_set_mnemonic_widget (GTK_LABEL (widget),
GTK_WIDGET (state->input_entry));
......@@ -469,7 +469,7 @@ dialog_tool_init (GenericToolState *state,
g_signal_connect_after (G_OBJECT (state->input_entry_2),
"changed",
G_CALLBACK (sensitivity_cb), state);
gnumeric_editable_enters (GTK_WINDOW (state->dialog),
gnm_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->input_entry_2));
gtk_label_set_mnemonic_widget (GTK_LABEL (widget),
GTK_WIDGET (state->input_entry_2));
......@@ -484,7 +484,7 @@ dialog_tool_init (GenericToolState *state,
dialog_tool_init_outputs (state, sensitivity_cb);
gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog), key);
gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog), key);
gnm_dialog_setup_destroy_handlers (GTK_DIALOG (state->dialog),
state->wbcg,
......@@ -541,10 +541,10 @@ tool_setup_update (GenericToolState* state, char const *name, GCallback cb,
GtkWidget *w = go_gtk_builder_get_widget (state->gui, name);
if (GTK_IS_SPIN_BUTTON (w)) {
g_signal_connect_after (w, "value-changed", cb, closure);
gnumeric_editable_enters (GTK_WINDOW (state->dialog), w);
gnm_editable_enters (GTK_WINDOW (state->dialog), w);
} else if (GTK_IS_ENTRY (w)) {
g_signal_connect_after (w, "changed", cb, closure);
gnumeric_editable_enters (GTK_WINDOW (state->dialog), w);
gnm_editable_enters (GTK_WINDOW (state->dialog), w);
} else if (GTK_IS_TOGGLE_BUTTON (w))
g_signal_connect_after (w, "toggled", cb, closure);
else
......@@ -703,7 +703,7 @@ dialog_correlation_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, CORRELATION_KEY))
if (gnm_dialog_raise_if_exists (wbcg, CORRELATION_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
......@@ -823,7 +823,7 @@ dialog_covariance_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, COVARIANCE_KEY))
if (gnm_dialog_raise_if_exists (wbcg, COVARIANCE_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
......@@ -915,7 +915,7 @@ dialog_ranking_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, RANK_PERCENTILE_KEY))
if (gnm_dialog_raise_if_exists (wbcg, RANK_PERCENTILE_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
......@@ -1008,7 +1008,7 @@ dialog_fourier_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, FOURIER_KEY))
if (gnm_dialog_raise_if_exists (wbcg, FOURIER_KEY))
return 0;
state = g_new0 (GenericToolState, 1);
......@@ -1220,7 +1220,7 @@ dialog_descriptive_stat_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, DESCRIPTIVE_STATS_KEY))
if (gnm_dialog_raise_if_exists (wbcg, DESCRIPTIVE_STATS_KEY))
return 0;
state = g_new0 (DescriptiveStatState, 1);
......@@ -1278,11 +1278,11 @@ dialog_descriptive_stat_tool (WBCGtk *wbcg, Sheet *sheet)
g_signal_connect_after (G_OBJECT (state->s_entry),
"changed",
G_CALLBACK (desc_stat_tool_update_sensitivity_cb), state);
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->c_entry));
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->l_entry));
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->s_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
......@@ -1600,7 +1600,7 @@ dialog_ttest_tool (WBCGtk *wbcg, Sheet *sheet, ttest_type test)
return 1;
/* Only pop up one copy per workbook */
dialog = gnumeric_dialog_raise_if_exists (wbcg, TTEST_KEY);
dialog = gnm_dialog_raise_if_exists (wbcg, TTEST_KEY);
if (dialog) {
state = g_object_get_data (G_OBJECT (dialog), "state");
state->invocation = test;
......@@ -1664,13 +1664,13 @@ dialog_ttest_tool (WBCGtk *wbcg, Sheet *sheet, ttest_type test)
g_signal_connect (G_OBJECT (state->base.dialog),
"realize",
G_CALLBACK (dialog_ttest_realized), state);
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->var1_variance));
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->var2_variance));
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->mean_diff_entry));
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->alpha_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
......@@ -1796,7 +1796,7 @@ dialog_ftest_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, FTEST_KEY))
if (gnm_dialog_raise_if_exists (wbcg, FTEST_KEY))
return 0;
state = g_new0 (FTestToolState, 1);
......@@ -1816,7 +1816,7 @@ dialog_ftest_tool (WBCGtk *wbcg, Sheet *sheet)
state->alpha_entry = go_gtk_builder_get_widget (state->base.gui, "one_alpha");
float_to_entry (GTK_ENTRY (state->alpha_entry), 0.05);
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->alpha_entry));
g_signal_connect_after (G_OBJECT (state->alpha_entry),
"changed",
......@@ -2053,7 +2053,7 @@ dialog_sampling_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, SAMPLING_KEY)) {
if (gnm_dialog_raise_if_exists (wbcg, SAMPLING_KEY)) {
return 0;
}
......@@ -2108,11 +2108,11 @@ dialog_sampling_tool (WBCGtk *wbcg, Sheet *sheet)
g_signal_connect_after (G_OBJECT (state->number_entry),
"changed",
G_CALLBACK (sampling_tool_update_sensitivity_cb), state);
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->period_entry));
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->random_entry));
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->number_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
......@@ -2416,7 +2416,7 @@ dialog_regression_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, REGRESSION_KEY))
if (gnm_dialog_raise_if_exists (wbcg, REGRESSION_KEY))
return 0;
state = g_new0 (RegressionToolState, 1);
......@@ -2439,7 +2439,7 @@ dialog_regression_tool (WBCGtk *wbcg, Sheet *sheet)
g_signal_connect_after (G_OBJECT (state->confidence_entry),
"changed",
G_CALLBACK (regression_tool_update_sensitivity_cb), state);
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->confidence_entry));
state->simple_linear_regression_radio
......@@ -2726,7 +2726,7 @@ dialog_exp_smoothing_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, EXP_SMOOTHING_KEY))
if (gnm_dialog_raise_if_exists (wbcg, EXP_SMOOTHING_KEY))
return 0;
state = g_new0 (ExpSmoothToolState, 1);
......@@ -2808,11 +2808,11 @@ dialog_exp_smoothing_tool (WBCGtk *wbcg, Sheet *sheet)
"toggled",
G_CALLBACK (exp_smoothing_tes_cb), state);
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->damping_fact_entry));
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->g_damping_fact_entry));
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->s_damping_fact_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
......@@ -3100,7 +3100,7 @@ dialog_average_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, AVERAGE_KEY))
if (gnm_dialog_raise_if_exists (wbcg, AVERAGE_KEY))
return 0;
state = g_new0 (AverageToolState, 1);
......@@ -3178,7 +3178,7 @@ dialog_average_tool (WBCGtk *wbcg, Sheet *sheet)
"changed",
G_CALLBACK (average_tool_interval_cb), state);
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->interval_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
......@@ -3372,7 +3372,7 @@ dialog_histogram_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, HISTOGRAM_KEY))
if (gnm_dialog_raise_if_exists (wbcg, HISTOGRAM_KEY))
return 0;
state = g_new0 (HistogramToolState, 1);
......@@ -3552,7 +3552,7 @@ dialog_anova_single_factor_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, ANOVA_SINGLE_KEY))
if (gnm_dialog_raise_if_exists (wbcg, ANOVA_SINGLE_KEY))
return 0;
state = g_new0 (AnovaSingleToolState, 1);
......@@ -3578,7 +3578,7 @@ dialog_anova_single_factor_tool (WBCGtk *wbcg, Sheet *sheet)
g_signal_connect_after (G_OBJECT (state->alpha_entry),
"changed",
G_CALLBACK (anova_single_tool_update_sensitivity_cb), state);
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->alpha_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
......@@ -3784,7 +3784,7 @@ dialog_anova_two_factor_tool (WBCGtk *wbcg, Sheet *sheet)
return 1;
/* Only pop up one copy per workbook */
if (gnumeric_dialog_raise_if_exists (wbcg, ANOVA_TWO_FACTOR_KEY))
if (gnm_dialog_raise_if_exists (wbcg, ANOVA_TWO_FACTOR_KEY))
return 0;
state = g_new0 (AnovaTwoFactorToolState, 1);
......@@ -3819,9 +3819,9 @@ dialog_anova_two_factor_tool (WBCGtk *wbcg, Sheet *sheet)
"changed",
G_CALLBACK (anova_two_factor_tool_update_sensitivity_cb),
state);
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->alpha_entry));
gnumeric_editable_enters (GTK_WINDOW (state->base.dialog),
gnm_editable_enters (GTK_WINDOW (state->base.dialog),
GTK_WIDGET (state->replication_entry));
gnm_dao_set_put (GNM_DAO (state->base.gdao), TRUE, TRUE);
......
......@@ -331,7 +331,7 @@ init_operator (AutoFilterState *state, GnmFilterOp op, GnmValue const *v,
gtk_combo_box_set_active (GTK_COMBO_BOX (w), i);
w = go_gtk_builder_get_widget (state->gui, val_widget);
gnumeric_editable_enters (GTK_WINDOW (state->dialog), w);
gnm_editable_enters (GTK_WINDOW (state->dialog), w);
if (v != NULL)
gtk_entry_set_text (GTK_ENTRY (w), content ? content : str);
......@@ -368,7 +368,7 @@ dialog_auto_filter_expression (WBCGtk *wbcg,
g_return_if_fail (wbcg != NULL);
if (gnumeric_dialog_raise_if_exists
if (gnm_dialog_raise_if_exists
(wbcg, DIALOG_KEY_EXPRESSION))
return;
gui = gnm_gtk_builder_load ("autofilter-expression.ui",
......@@ -431,7 +431,7 @@ dialog_auto_filter_expression (WBCGtk *wbcg,
G_CALLBACK (cb_autofilter_cancel), state);
/* a candidate for merging into attach guru */
gnumeric_init_help_button (
gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_AUTOFILTER_CUSTOM);
......@@ -443,7 +443,7 @@ dialog_auto_filter_expression (WBCGtk *wbcg,
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify)cb_autofilter_destroy);
gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
DIALOG_KEY_EXPRESSION);
gtk_widget_show (state->dialog);
}
......@@ -469,7 +469,7 @@ dialog_auto_filter (WBCGtk *wbcg,
g_return_if_fail (wbcg != NULL);
if (gnumeric_dialog_raise_if_exists (wbcg, DIALOG_KEY))
if (gnm_dialog_raise_if_exists (wbcg, DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("autofilter-top10.ui",
NULL, GO_CMD_CONTEXT (wbcg));
......@@ -561,7 +561,7 @@ dialog_auto_filter (WBCGtk *wbcg,
G_CALLBACK (cb_autofilter_cancel), state);
/* a candidate for merging into attach guru */
gnumeric_init_help_button (
gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_AUTOFILTER_TOP_TEN);
......@@ -573,7 +573,7 @@ dialog_auto_filter (WBCGtk *wbcg,
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify)cb_autofilter_destroy);
gnumeric_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
gnm_keyed_dialog (wbcg, GTK_WINDOW (state->dialog),
DIALOG_KEY);
gtk_widget_show (state->dialog);
}
......@@ -411,7 +411,7 @@ cb_canvas_button_press (GocCanvas *canvas,
state->selected_template = ft;
gtk_entry_set_text (state->info_name, _(ft->name));
gtk_entry_set_text (state->info_author, ft->author);
gnumeric_textview_set_text (GTK_TEXT_VIEW (state->info_descr),
gnm_textview_set_text (GTK_TEXT_VIEW (state->info_descr),
_(ft->description));
gtk_entry_set_text (state->info_cat, _(ft->category->name));
......@@ -642,7 +642,7 @@ dialog_autoformat (WBCGtk *wbcg)
gtk_widget_show_all (GTK_WIDGET (state->category));
}
gnumeric_init_help_button (
gnm_init_help_button (
go_gtk_builder_get_widget (gui, "help_button"),
GNUMERIC_HELP_LINK_AUTOFORMAT);
......
......@@ -122,7 +122,7 @@ dialog_autosave (WBCGtk *wbcg)
g_return_if_fail (wbcg != NULL);
if (gnumeric_dialog_raise_if_exists (wbcg, AUTOSAVE_KEY))
if (gnm_dialog_raise_if_exists (wbcg, AUTOSAVE_KEY))
return;
gui = gnm_gtk_builder_load ("autosave.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
......@@ -155,7 +155,7 @@ dialog_autosave (WBCGtk *wbcg)
float_to_entry (GTK_ENTRY (state->minutes_entry),
secs / 60);
gnumeric_editable_enters (GTK_WINDOW (state->dialog),
gnm_editable_enters (GTK_WINDOW (state->dialog),
state->minutes_entry);
g_signal_connect (G_OBJECT (state->autosave_on_off),
......@@ -173,7 +173,7 @@ dialog_autosave (WBCGtk *wbcg)
g_object_set_data_full (G_OBJECT (state->dialog),
"state", state, (GDestroyNotify)g_free);
gnumeric_init_help_button (
gnm_init_help_button (
go_gtk_builder_get_widget (gui, "button3"),
GNUMERIC_HELP_LINK_AUTOSAVE);
......@@ -183,7 +183,7 @@ dialog_autosave (WBCGtk *wbcg)
prompt);
autosave_set_sensitivity (NULL, state);
gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
AUTOSAVE_KEY);
gtk_widget_show (state->dialog);
......
......@@ -106,7 +106,7 @@ dialog_cell_comment (WBCGtk *wbcg, Sheet *sheet, GnmCellPos const *pos)
g_return_if_fail (sheet != NULL);
g_return_if_fail (pos != NULL);
if (gnumeric_dialog_raise_if_exists (wbcg, COMMENT_DIALOG_KEY))
if (gnm_dialog_raise_if_exists (wbcg, COMMENT_DIALOG_KEY))
return;
gui = gnm_gtk_builder_load ("cell-comment.ui", NULL, GO_CMD_CONTEXT (wbcg));
if (gui == NULL)
......@@ -189,7 +189,7 @@ dialog_cell_comment (WBCGtk *wbcg, Sheet *sheet, GnmCellPos const *pos)
G_CALLBACK (cb_wrap_toggled), state->gtv);
cb_wrap_toggled (GTK_TOGGLE_BUTTON (check), G_OBJECT (state->gtv));
gnumeric_init_help_button (
gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "help_button"),
GNUMERIC_HELP_LINK_CELL_COMMENT);
......@@ -200,7 +200,7 @@ dialog_cell_comment (WBCGtk *wbcg, Sheet *sheet, GnmCellPos const *pos)
gnm_dialog_setup_destroy_handlers (GTK_DIALOG (state->dialog), state->wbcg,
GNM_DIALOG_DESTROY_CURRENT_SHEET_REMOVED);
gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
gnm_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
COMMENT_DIALOG_KEY);
gtk_widget_show (state->dialog);
}
......@@ -1325,7 +1325,7 @@ dialog_cell_format_cond (WBCGtk *wbcg)
c_fmt_dialog_load (state);
gnumeric_init_help_button (
gnm_init_help_button (
go_gtk_builder_get_widget (state->gui, "helpbutton"),
GNUMERIC_HELP_LINK_CELL_FORMAT_COND);
......@@ -1344,7 +1344,7 @@ dialog_cell_format_cond (WBCGtk *wbcg)
g_signal_connect (G_OBJECT (dialog), "destroy",
G_CALLBACK (cb_dialog_destroy), NULL);
gnumeric_restore_window_geometry (GTK_WINDOW (state->dialog),
gnm_restore_window_geometry (GTK_WINDOW (state->dialog),
CELL_FORMAT_KEY);
go_gtk_nonmodal_dialog (wbcg_toplevel (state->wbcg),
......
......@@ -652,7 +652,7 @@ fmt_dialog_init_align_page (FormatState *state)
G_CALLBACK (cb_indent_changed), state);
/* Catch <return> in the spin box */
gnumeric_editable_enters (
gnm_editable_enters (
GTK_WINDOW (state->dialog),
GTK_WIDGET (w));
......@@ -1616,7 +1616,7 @@ validation_rebuild_validation (FormatState *state)
ValidationStyle style = gtk_combo_box_get_active (state->validation.error.action);
ValidationOp op = gtk_combo_box_get_active (state->validation.op);
char *title = gtk_editable_get_chars (GTK_EDITABLE (state->validation.error.title), 0, -1);
char *msg = gnumeric_textview_get_text (state->validation.error.msg);
char *msg = gnm_textview_get_text (state->validation.error.msg);
GnmExprTop const *texpr0 =
validation_entry_to_expr (state->sheet,
state->validation.expr0.entry);
......@@ -1801,7 +1801,7 @@ fmt_dialog_init_validation_expr_entry (FormatState *state, ExprEntry *entry,
gtk_grid_attach (state->validation.criteria_grid,
GTK_WIDGET (entry->entry), 1, 3+i, 3, 1);
gtk_widget_show (GTK_WIDGET (entry->entry));
gnumeric_editable_enters (
gnm_editable_enters (
GTK_WINDOW (state->dialog),
GTK_WIDGET (entry->entry));
gnm_expr_entry_set_flags (entry->entry, GNM_EE_FORCE_ABS_REF | GNM_EE_SHEET_OPTIONAL, GNM_EE_MASK);
......@@ -1890,7 +1890,7 @@ fmt_dialog_init_validation_page (FormatState *state)
state->validation.error.msg = GTK_TEXT_VIEW (go_gtk_builder_get_widget (state->gui, "validation_error_msg"));
state->validation.error.image = GTK_IMAGE (go_gtk_builder_get_widget (state->gui, "validation_error_image"));
gnumeric_editable_enters (
gnm_editable_enters (
GTK_WINDOW (state->dialog),
GTK_WIDGET (state->validation.error.title));
......@@ -1933,7 +1933,7 @@ fmt_dialog_init_validation_page (FormatState *state)
gtk_entry_set_text (GTK_ENTRY (state->validation.error.title),
(v->title != NULL) ? v->title->str : "");
if (v->msg != NULL)
gnumeric_textview_set_text (GTK_TEXT_VIEW (state->validation.error.msg),
gnm_textview_set_text (GTK_TEXT_VIEW (state->validation.error.msg),
v->msg->str);
gtk_toggle_button_set_active (state->validation.allow_blank, v->allow_blank);
gtk_toggle_button_set_active (state->validation.use_dropdown, v->use_dropdown);
......@@ -1956,7 +1956,7 @@ static void
input_msg_rebuild_input_msg (FormatState *state)
{
GnmInputMsg *im;
char *msg = gnumeric_textview_get_text (state->input_msg.msg);
char *msg = gnm_textview_get_text (state->input_msg.msg);
char const *title = gtk_entry_get_text (state->input_msg.title);
im = gnm_input_msg_new (msg, title);
......@@ -2011,12 +2011,12 @@ fmt_dialog_init_input_msg_page (FormatState *state)
if (im) {
gtk_entry_set_text (state->input_msg.title,
gnm_input_msg_get_title (im));
gnumeric_textview_set_text (state->input_msg.msg,
gnm_textview_set_text (state->input_msg.msg,