[goffice] Get rid of go_libglade_new.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Subject: [goffice] Get rid of go_libglade_new.
- Date: Fri, 17 Apr 2009 19:41:51 -0400 (EDT)
commit 92e518b2c8956e50d1697066e94bfa45fb72c3c3
Author: Morten Welinder <terra gnome org>
Date: Fri Apr 17 19:41:58 2009 -0400
Get rid of go_libglade_new.
* goffice/gtk/goffice-gtk.c (go_libglade_new): Actually remove
this alias as threatened. All internal users fixed.
---
ChangeLog | 5 +++++
goffice/graph/gog-3d-box.c | 2 +-
goffice/graph/gog-axis-line.c | 2 +-
goffice/graph/gog-axis.c | 2 +-
goffice/graph/gog-equation.c | 2 +-
goffice/graph/gog-error-bar.c | 2 +-
goffice/graph/gog-graph.c | 2 +-
goffice/graph/gog-guru.c | 4 ++--
goffice/graph/gog-label.c | 2 +-
goffice/graph/gog-object.c | 2 +-
goffice/graph/gog-plot.c | 2 +-
goffice/graph/gog-reg-curve.c | 2 +-
goffice/graph/gog-series.c | 4 ++--
goffice/gtk/go-3d-rotation-sel.c | 2 +-
goffice/gtk/go-action-combo-stack.c | 16 +++++++++-------
goffice/gtk/go-action-combo-stack.h | 6 +++---
goffice/gtk/go-action-combo-text.h | 2 +-
goffice/gtk/go-font-sel.c | 2 +-
goffice/gtk/go-format-sel.c | 2 +-
goffice/gtk/go-image-sel.c | 2 +-
goffice/gtk/go-rotation-sel.c | 2 +-
goffice/gtk/goffice-gtk.c | 17 ++++++++++-------
goffice/gtk/goffice-gtk.h | 14 ++++++++------
goffice/utils/datetime.c | 7 ++-----
goffice/utils/datetime.h | 8 ++++----
goffice/utils/go-file.c | 2 +-
goffice/utils/go-glib-extras.h | 2 +-
goffice/utils/go-style.c | 6 +++---
plugins/plot_barcol/gog-barcol-prefs.c | 2 +-
plugins/plot_barcol/gog-minmax.c | 2 +-
plugins/plot_distrib/gog-boxplot.c | 2 +-
plugins/plot_pie/gog-pie-prefs.c | 6 +++---
plugins/plot_surface/gog-xyz-prefs.c | 2 +-
plugins/plot_surface/gog-xyz-surface-prefs.c | 2 +-
plugins/plot_xy/gog-bubble-prefs.c | 2 +-
plugins/plot_xy/gog-xy.c | 4 ++--
plugins/smoothing/gog-exp-smooth.c | 2 +-
plugins/smoothing/gog-moving-avg.c | 2 +-
38 files changed, 79 insertions(+), 70 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d1e03ef..17d8123 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2009-04-17 Morten Welinder <terra gnome org>
+ * goffice/gtk/goffice-gtk.c (go_libglade_new): Actually remove
+ this alias as threatened. All internal users fixed.
+
+ * */*.c: Doc fixes to please gtk-doc.
+
* goffice/graph/gog-axis.c (map_date_auto_bound): Fix problem with
upper bound when step is in years and maximum in not on January 1.
diff --git a/goffice/graph/gog-3d-box.c b/goffice/graph/gog-3d-box.c
index 2750679..b9a4960 100644
--- a/goffice/graph/gog-3d-box.c
+++ b/goffice/graph/gog-3d-box.c
@@ -165,7 +165,7 @@ gog_3d_box_populate_editor (GogObject *gobj,
go_3d_rotation_sel_set_fov (GO_3D_ROTATION_SEL (g3d), box->fov);
go_editor_add_page (editor, g3d, _("Rotation"));
- gui = go_libglade_new ("gog-3d-box-prefs.glade", "gog_3d_box_prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-3d-box-prefs.glade", "gog_3d_box_prefs", GETTEXT_PACKAGE, cc);
if (gui == NULL)
return;
diff --git a/goffice/graph/gog-axis-line.c b/goffice/graph/gog-axis-line.c
index d87daf8..91b94de 100644
--- a/goffice/graph/gog-axis-line.c
+++ b/goffice/graph/gog-axis-line.c
@@ -530,7 +530,7 @@ gog_axis_base_populate_editor (GogObject *gobj,
return;
}
- gui = go_libglade_new ("gog-axis-prefs.glade", "axis_base_pref_box", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-axis-prefs.glade", "axis_base_pref_box", GETTEXT_PACKAGE, cc);
if (gui == NULL) {
(GOG_OBJECT_CLASS(gab_parent_klass)->populate_editor) (gobj, editor, dalloc, cc);
return;
diff --git a/goffice/graph/gog-axis.c b/goffice/graph/gog-axis.c
index b9526bc..ee3dacd 100644
--- a/goffice/graph/gog-axis.c
+++ b/goffice/graph/gog-axis.c
@@ -2159,7 +2159,7 @@ gog_axis_populate_editor (GogObject *gobj,
GogDataset *set = GOG_DATASET (gobj);
GladeXML *gui;
- gui = go_libglade_new ("gog-axis-prefs.glade", "axis_pref_box", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-axis-prefs.glade", "axis_pref_box", GETTEXT_PACKAGE, cc);
if (gui == NULL)
return;
diff --git a/goffice/graph/gog-equation.c b/goffice/graph/gog-equation.c
index 170fca2..1ac09a2 100644
--- a/goffice/graph/gog-equation.c
+++ b/goffice/graph/gog-equation.c
@@ -92,7 +92,7 @@ gog_equation_populate_editor (GogObject *obj,
GtkTextBuffer *buffer;
static guint equation_pref_page = 0;
- gui = go_libglade_new ("gog-equation-prefs.glade", "gog_equation_prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-equation-prefs.glade", "gog_equation_prefs", GETTEXT_PACKAGE, cc);
g_return_if_fail (gui != NULL);
widget = glade_xml_get_widget (gui, "equation_text");
diff --git a/goffice/graph/gog-error-bar.c b/goffice/graph/gog-error-bar.c
index 368a583..a046a1f 100644
--- a/goffice/graph/gog-error-bar.c
+++ b/goffice/graph/gog-error-bar.c
@@ -233,7 +233,7 @@ gog_error_bar_prefs (GogSeries *series,
}
set = GOG_DATASET (series);
- gui = go_libglade_new ("gog-error-bar-prefs.glade", "gog_error_bar_prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-error-bar-prefs.glade", "gog_error_bar_prefs", GETTEXT_PACKAGE, cc);
/* Style properties */
diff --git a/goffice/graph/gog-graph.c b/goffice/graph/gog-graph.c
index f4b11b0..560228a 100644
--- a/goffice/graph/gog-graph.c
+++ b/goffice/graph/gog-graph.c
@@ -199,7 +199,7 @@ gog_graph_populate_editor (GogObject *gobj,
GSList *theme_names;
static guint graph_pref_page = 0;
- gui = go_libglade_new ("gog-graph-prefs.glade", "gog_graph_prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-graph-prefs.glade", "gog_graph_prefs", GETTEXT_PACKAGE, cc);
if (gui == NULL)
return;
diff --git a/goffice/graph/gog-guru.c b/goffice/graph/gog-guru.c
index aacdca6..858dc72 100644
--- a/goffice/graph/gog-guru.c
+++ b/goffice/graph/gog-guru.c
@@ -1117,7 +1117,7 @@ graph_guru_type_selector_new (GraphGuruState *s)
GtkWidget *selector;
GladeXML *gui;
- gui = go_libglade_new ("gog-guru-type-selector.glade", "type_selector", GETTEXT_PACKAGE, s->cc);
+ gui = go_glade_new ("gog-guru-type-selector.glade", "type_selector", GETTEXT_PACKAGE, s->cc);
typesel = g_new0 (GraphGuruTypeSelector, 1);
typesel->state = s;
@@ -1217,7 +1217,7 @@ graph_guru_type_selector_new (GraphGuruState *s)
static gboolean
graph_guru_init (GraphGuruState *s)
{
- s->gui = go_libglade_new ("gog-guru.glade", NULL, GETTEXT_PACKAGE, s->cc);
+ s->gui = go_glade_new ("gog-guru.glade", NULL, GETTEXT_PACKAGE, s->cc);
if (s->gui == NULL)
return TRUE;
diff --git a/goffice/graph/gog-label.c b/goffice/graph/gog-label.c
index bd265e7..d689ddd 100644
--- a/goffice/graph/gog-label.c
+++ b/goffice/graph/gog-label.c
@@ -353,7 +353,7 @@ gog_reg_eqn_populate_editor (GogObject *gobj,
GladeXML *gui;
GogRegEqn *reg_eqn = GOG_REG_EQN (gobj);
- gui = go_libglade_new ("gog-reg-eqn-prefs.glade", "reg-eqn-prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-reg-eqn-prefs.glade", "reg-eqn-prefs", GETTEXT_PACKAGE, cc);
if (gui == NULL)
return;
diff --git a/goffice/graph/gog-object.c b/goffice/graph/gog-object.c
index 442d2e1..36a826d 100644
--- a/goffice/graph/gog-object.c
+++ b/goffice/graph/gog-object.c
@@ -386,7 +386,7 @@ gog_object_populate_editor (GogObject *gobj,
if (!(allowable_positions & (GOG_POSITION_MANUAL | GOG_POSITION_COMPASS)))
return;
- gui = go_libglade_new ("gog-object-prefs.glade", "gog_object_prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-object-prefs.glade", "gog_object_prefs", GETTEXT_PACKAGE, cc);
if (gui == NULL)
return;
diff --git a/goffice/graph/gog-plot.c b/goffice/graph/gog-plot.c
index cdb0c3f..aa6f8aa 100644
--- a/goffice/graph/gog-plot.c
+++ b/goffice/graph/gog-plot.c
@@ -283,7 +283,7 @@ gog_plot_populate_editor (GogObject *obj,
gboolean is_plot_area_manual;
g_return_if_fail (chart != NULL);
- gui = go_libglade_new ("gog-plot-prefs.glade", "gog_plot_prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-plot-prefs.glade", "gog_plot_prefs", GETTEXT_PACKAGE, cc);
g_return_if_fail (gui != NULL);
state = g_new (PlotPrefState, 1);
diff --git a/goffice/graph/gog-reg-curve.c b/goffice/graph/gog-reg-curve.c
index 430b4e9..2571007 100644
--- a/goffice/graph/gog-reg-curve.c
+++ b/goffice/graph/gog-reg-curve.c
@@ -79,7 +79,7 @@ gog_reg_curve_populate_editor (GogObject *gobj,
GladeXML *gui;
GogDataset *set = GOG_DATASET (gobj);
- gui = go_libglade_new ("gog-reg-curve-prefs.glade", "reg-curve-prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-reg-curve-prefs.glade", "reg-curve-prefs", GETTEXT_PACKAGE, cc);
if (gui == NULL)
return;
diff --git a/goffice/graph/gog-series.c b/goffice/graph/gog-series.c
index b211f52..516b858 100644
--- a/goffice/graph/gog-series.c
+++ b/goffice/graph/gog-series.c
@@ -532,7 +532,7 @@ gog_series_populate_editor (GogObject *gobj,
GladeXML *gui;
GtkWidget *widget;
- gui = go_libglade_new ("gog-series-prefs.glade", "interpolation_prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-series-prefs.glade", "interpolation_prefs", GETTEXT_PACKAGE, cc);
if (gui != NULL) {
int i;
GogAxisSet set = gog_plot_axis_set_pref (gog_series_get_plot (series));
@@ -586,7 +586,7 @@ gog_series_populate_editor (GogObject *gobj,
GladeXML *gui;
GtkWidget *widget;
- gui = go_libglade_new ("gog-series-prefs.glade", "fill_type_prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("gog-series-prefs.glade", "fill_type_prefs", GETTEXT_PACKAGE, cc);
if (gui != NULL) {
widget = glade_xml_get_widget (gui, "fill_type_combo");
gog_series_populate_fill_type_combo (GOG_SERIES (series), GTK_COMBO_BOX (widget));
diff --git a/goffice/gtk/go-3d-rotation-sel.c b/goffice/gtk/go-3d-rotation-sel.c
index 32c7120..17756c7 100644
--- a/goffice/gtk/go-3d-rotation-sel.c
+++ b/goffice/gtk/go-3d-rotation-sel.c
@@ -326,7 +326,7 @@ g3d_init (GO3DRotationSel *g3d)
{
GtkWidget *w;
- g3d->gui = go_libglade_new ("go-3d-rotation-sel.glade", "toplevel",
+ g3d->gui = go_glade_new ("go-3d-rotation-sel.glade", "toplevel",
GETTEXT_PACKAGE, NULL);
if (g3d->gui == NULL)
return;
diff --git a/goffice/gtk/go-action-combo-stack.c b/goffice/gtk/go-action-combo-stack.c
index 5c9874d..a6a24d1 100644
--- a/goffice/gtk/go-action-combo-stack.c
+++ b/goffice/gtk/go-action-combo-stack.c
@@ -395,10 +395,10 @@ check_sensitivity (GOActionComboStack *saction, unsigned old_count)
* @key : a key value to id the pushe item
**/
void
-go_action_combo_stack_push (GOActionComboStack *a,
+go_action_combo_stack_push (GOActionComboStack *act,
char const *label, gpointer key)
{
- GOActionComboStack *saction = GO_ACTION_COMBO_STACK (a);
+ GOActionComboStack *saction = GO_ACTION_COMBO_STACK (act);
GtkTreeIter iter;
unsigned old_count = gtk_tree_model_iter_n_children (saction->model, NULL);
@@ -421,9 +421,9 @@ go_action_combo_stack_push (GOActionComboStack *a,
* shorter)
**/
void
-go_action_combo_stack_pop (GOActionComboStack *a, unsigned n)
+go_action_combo_stack_pop (GOActionComboStack *act, unsigned n)
{
- GOActionComboStack *saction = GO_ACTION_COMBO_STACK (a);
+ GOActionComboStack *saction = GO_ACTION_COMBO_STACK (act);
GtkTreeIter iter;
unsigned old_count = gtk_tree_model_iter_n_children (saction->model, NULL);
@@ -445,14 +445,16 @@ go_action_combo_stack_pop (GOActionComboStack *a, unsigned n)
* bottom.
**/
void
-go_action_combo_stack_truncate (GOActionComboStack *a, unsigned n)
+go_action_combo_stack_truncate (GOActionComboStack *act, unsigned n)
{
- GOActionComboStack *saction = GO_ACTION_COMBO_STACK (a);
+ GOActionComboStack *saction = GO_ACTION_COMBO_STACK (act);
GtkTreeIter iter;
- unsigned old_count = gtk_tree_model_iter_n_children (saction->model, NULL);
+ unsigned old_count;
g_return_if_fail (saction != NULL);
+ old_count = gtk_tree_model_iter_n_children (saction->model, NULL);
+
if (gtk_tree_model_iter_nth_child (saction->model, &iter, NULL, n))
while (gtk_list_store_remove (GTK_LIST_STORE (saction->model), &iter))
;
diff --git a/goffice/gtk/go-action-combo-stack.h b/goffice/gtk/go-action-combo-stack.h
index 240d170..e60f0a9 100644
--- a/goffice/gtk/go-action-combo-stack.h
+++ b/goffice/gtk/go-action-combo-stack.h
@@ -33,10 +33,10 @@ G_BEGIN_DECLS
typedef struct _GOActionComboStack GOActionComboStack;
GType go_action_combo_stack_get_type (void);
-void go_action_combo_stack_push (GOActionComboStack *a,
+void go_action_combo_stack_push (GOActionComboStack *act,
char const *str, gpointer key);
-void go_action_combo_stack_pop (GOActionComboStack *a, unsigned n);
-void go_action_combo_stack_truncate (GOActionComboStack *a, unsigned n);
+void go_action_combo_stack_pop (GOActionComboStack *act, unsigned n);
+void go_action_combo_stack_truncate (GOActionComboStack *act, unsigned n);
gpointer go_action_combo_stack_selection (GOActionComboStack const *a);
G_END_DECLS
diff --git a/goffice/gtk/go-action-combo-text.h b/goffice/gtk/go-action-combo-text.h
index 037c22e..8bbfe4e 100644
--- a/goffice/gtk/go-action-combo-text.h
+++ b/goffice/gtk/go-action-combo-text.h
@@ -43,7 +43,7 @@ void go_action_combo_text_add_item (GOActionComboText *a,
void go_action_combo_text_set_width (GOActionComboText *a,
char const *largest_elem);
char const *go_action_combo_text_get_entry (GOActionComboText const *a);
-void go_action_combo_text_set_entry (GOActionComboText *a,
+void go_action_combo_text_set_entry (GOActionComboText *taction,
char const *text,
GOActionComboTextSearchDir dir);
diff --git a/goffice/gtk/go-font-sel.c b/goffice/gtk/go-font-sel.c
index 3eb2137..77a10af 100644
--- a/goffice/gtk/go-font-sel.c
+++ b/goffice/gtk/go-font-sel.c
@@ -343,7 +343,7 @@ gfs_init (GOFontSel *gfs)
{
GtkWidget *w;
- gfs->gui = go_libglade_new ("go-font-sel.glade", "toplevel-table", GETTEXT_PACKAGE, NULL);
+ gfs->gui = go_glade_new ("go-font-sel.glade", "toplevel-table", GETTEXT_PACKAGE, NULL);
if (gfs->gui == NULL)
return;
diff --git a/goffice/gtk/go-format-sel.c b/goffice/gtk/go-format-sel.c
index 949f39a..e4c3b69 100644
--- a/goffice/gtk/go-format-sel.c
+++ b/goffice/gtk/go-format-sel.c
@@ -1266,7 +1266,7 @@ nfs_init (GOFormatSel *gfs)
gfs->show_format_with_markup = FALSE;
gfs->locale = NULL;
- gfs->gui = go_libglade_new ("go-format-sel.glade", NULL, GETTEXT_PACKAGE, NULL);
+ gfs->gui = go_glade_new ("go-format-sel.glade", NULL, GETTEXT_PACKAGE, NULL);
if (gfs->gui == NULL)
return;
diff --git a/goffice/gtk/go-image-sel.c b/goffice/gtk/go-image-sel.c
index 00c034e..acde892 100644
--- a/goffice/gtk/go-image-sel.c
+++ b/goffice/gtk/go-image-sel.c
@@ -199,7 +199,7 @@ go_image_sel_new (GODoc *doc, GOCmdContext *cc, GOImage **image)
state->doc = doc;
state->cc = cc;
state->result = image;
- state->gui = go_libglade_new ("go-image-sel.glade", NULL, GETTEXT_PACKAGE, state->cc);
+ state->gui = go_glade_new ("go-image-sel.glade", NULL, GETTEXT_PACKAGE, state->cc);
if (state->gui == NULL) {
g_free (state);
return NULL;
diff --git a/goffice/gtk/go-rotation-sel.c b/goffice/gtk/go-rotation-sel.c
index a93ac97..40c9484 100644
--- a/goffice/gtk/go-rotation-sel.c
+++ b/goffice/gtk/go-rotation-sel.c
@@ -213,7 +213,7 @@ grs_init (GORotationSel *grs)
{
GtkWidget *w;
- grs->gui = go_libglade_new ("go-rotation-sel.glade", "toplevel", GETTEXT_PACKAGE, NULL);
+ grs->gui = go_glade_new ("go-rotation-sel.glade", "toplevel", GETTEXT_PACKAGE, NULL);
if (grs->gui == NULL)
return;
diff --git a/goffice/gtk/goffice-gtk.c b/goffice/gtk/goffice-gtk.c
index aa21a60..fd3e4a1 100644
--- a/goffice/gtk/goffice-gtk.c
+++ b/goffice/gtk/goffice-gtk.c
@@ -103,8 +103,10 @@ go_gtk_dialog_add_button (GtkDialog *dialog, char const* text, char const* stock
/**
* go_glade_new :
- * @gcc : #GOCmdContext
* @gladefile : the name of the file load
+ * @root :
+ * @domain :
+ * @gcc : #GOCmdContext
*
* Simple utility to open glade files
*
@@ -142,7 +144,7 @@ go_glade_new (char const *gladefile, char const *root,
* @gui : #GladeXML
* @instance_name : widget name
* @detailed_signal : signal name
- * @c_handle : #GCallback
+ * @c_handler : #GCallback
* @data : arbitrary
*
* Convenience wrapper around g_signal_connect for glade.
@@ -164,11 +166,11 @@ go_glade_signal_connect (GladeXML *gui,
}
/**
- * go_glade_signal_connect :
+ * go_glade_signal_connect_swapped :
* @gui : #GladeXML
* @instance_name : widget name
* @detailed_signal : signal name
- * @c_handle : #GCallback
+ * @c_handler : #GCallback
* @data : arbitary
*
* Convenience wrapper around g_signal_connect_swapped for glade.
@@ -191,8 +193,9 @@ go_glade_signal_connect_swapped (GladeXML *gui,
/**
* go_xml_builder_new :
+ * @uifile : the name of the file load
+ * @domain :
* @gcc : #GOCmdContext
- * @gladefile : the name of the file load
*
* Simple utility to open ui files
*
@@ -200,7 +203,7 @@ go_glade_signal_connect_swapped (GladeXML *gui,
**/
GtkBuilder *
go_xml_builder_new (char const *uifile,
- char const *domain, GOCmdContext *gcc)
+ char const *domain, GOCmdContext *gcc)
{
GtkBuilder *gui;
char *f;
@@ -684,7 +687,7 @@ go_gui_get_image_save_info (GtkWindow *toplevel, GSList *supported_formats,
g_object_set (G_OBJECT (fsel), "title", _("Save as"), NULL);
- gui = go_libglade_new ("go-image-save-dialog-extra.glade",
+ gui = go_glade_new ("go-image-save-dialog-extra.glade",
"image_save_dialog_extra",
GETTEXT_PACKAGE, NULL);
if (gui != NULL) {
diff --git a/goffice/gtk/goffice-gtk.h b/goffice/gtk/goffice-gtk.h
index 300a186..540564e 100644
--- a/goffice/gtk/goffice-gtk.h
+++ b/goffice/gtk/goffice-gtk.h
@@ -28,10 +28,10 @@ G_BEGIN_DECLS
void go_gtk_editable_enters (GtkWindow *window, GtkWidget *w);
-/* go_libglade_new deprecated in 0.4.3, will be removed in 0.7.x */
-#define go_libglade_new go_glade_new
-GladeXML *go_glade_new (char const *gladefile, char const *root,
- char const *domain, GOCmdContext *cc);
+GladeXML *go_glade_new (char const *gladefile,
+ char const *root,
+ char const *domain,
+ GOCmdContext *gcc);
gulong go_glade_signal_connect (GladeXML *gui,
gchar const *instance_name,
gchar const *detailed_signal,
@@ -70,8 +70,10 @@ void go_gtk_help_button_init (GtkWidget *w, char const *data_dir,
void go_gtk_nonmodal_dialog (GtkWindow *toplevel, GtkWindow *dialog);
gboolean go_gtk_file_sel_dialog (GtkWindow *toplevel, GtkWidget *w);
char *go_gtk_select_image (GtkWindow *toplevel, const char *initial);
-char *go_gui_get_image_save_info (GtkWindow *toplevel, GSList *supported_formats,
- GOImageFormat *ret_format, double *dpi);
+char *go_gui_get_image_save_info (GtkWindow *toplevel,
+ GSList *supported_formats,
+ GOImageFormat *ret_format,
+ double *resolution);
gboolean go_gtk_url_is_writeable (GtkWindow *parent, char const *uri,
gboolean overwrite_by_default);
diff --git a/goffice/utils/datetime.c b/goffice/utils/datetime.c
index 0c2a049..ccb7f0a 100644
--- a/goffice/utils/datetime.c
+++ b/goffice/utils/datetime.c
@@ -434,7 +434,7 @@ go_coup_cd (GDate *result, GDate const *settlement, GDate const *maturity,
**/
double
go_coupdays (GDate const *settlement, GDate const *maturity,
- GnmCouponConvention const *conv)
+ GnmCouponConvention const *conv)
{
GDate prev, next;
@@ -479,16 +479,13 @@ go_coupdaybs (GDate const *settlement, GDate const *maturity,
* go_coupdaysnc :
* @settlement :
* @maturity :
- * @freq :
- * @basis :
- * @eom :
*
* Returns: the number of days from the settlement date to the next
* coupon date.
**/
double
go_coupdaysnc (GDate const *settlement, GDate const *maturity,
- GnmCouponConvention const *conv)
+ GnmCouponConvention const *conv)
{
GDate next_coupon;
go_coup_cd (&next_coupon, settlement, maturity, conv->freq, conv->eom, TRUE);
diff --git a/goffice/utils/datetime.h b/goffice/utils/datetime.h
index 8c0af0a..ac82f79 100644
--- a/goffice/utils/datetime.h
+++ b/goffice/utils/datetime.h
@@ -79,13 +79,13 @@ typedef struct {
GODateConventions const *date_conv;
} GnmCouponConvention;
-void go_coup_cd (GDate *res, GDate const *settle, GDate const *mat,
+void go_coup_cd (GDate *res, GDate const *settle, GDate const *mat,
int freq, gboolean eom, gboolean next);
-double go_coupdays (GDate const *settle, GDate const *mat,
+double go_coupdays (GDate const *settlement, GDate const *maturity,
GnmCouponConvention const *conv);
-double go_coupdaybs (GDate const *settle, GDate const *mat,
+double go_coupdaybs (GDate const *settlement, GDate const *maturity,
GnmCouponConvention const *conv);
-double go_coupdaysnc (GDate const *settle, GDate const *mat,
+double go_coupdaysnc (GDate const *settlement, GDate const *maturity,
GnmCouponConvention const *conv);
int gnm_date_convention_base (GODateConventions const *conv);
diff --git a/goffice/utils/go-file.c b/goffice/utils/go-file.c
index 6050aa8..a00b7e4 100644
--- a/goffice/utils/go-file.c
+++ b/goffice/utils/go-file.c
@@ -891,7 +891,7 @@ go_file_get_date_changed (char const *uri)
/**
* go_url_decode:
- * @test :
+ * @text :
*
* Decode the result of go_url_encode.
*
diff --git a/goffice/utils/go-glib-extras.h b/goffice/utils/go-glib-extras.h
index e2e6a4d..02e21ce 100644
--- a/goffice/utils/go-glib-extras.h
+++ b/goffice/utils/go-glib-extras.h
@@ -110,7 +110,7 @@ typedef gboolean (*GOParseKeyValueFunc) (const char *name,
gboolean go_parse_key_value (const char *options,
GError **err,
- GOParseKeyValueFunc func,
+ GOParseKeyValueFunc handler,
gpointer user);
G_END_DECLS
diff --git a/goffice/utils/go-style.c b/goffice/utils/go-style.c
index 1f679fb..38fe82e 100644
--- a/goffice/utils/go-style.c
+++ b/goffice/utils/go-style.c
@@ -758,7 +758,7 @@ marker_init (StylePrefState *state, gboolean enable, GOEditor *editor, GOCmdCont
if (!enable)
return;
- gui = go_libglade_new ("go-style-prefs.glade", "go_style_marker_prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("go-style-prefs.glade", "go_style_marker_prefs", GETTEXT_PACKAGE, cc);
if (gui == NULL)
return;
@@ -871,7 +871,7 @@ font_init (StylePrefState *state, guint32 enable, GOEditor *editor, GOCmdContext
g_return_if_fail (style->font.font != NULL);
- gui = go_libglade_new ("go-style-prefs.glade", "go_style_font_prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("go-style-prefs.glade", "go_style_font_prefs", GETTEXT_PACKAGE, cc);
if (gui == NULL)
return;
@@ -989,7 +989,7 @@ go_style_populate_editor (GOStyle *style,
go_styled_object_get_document (GO_STYLED_OBJECT (object_with_style)): NULL;
if ((enable & (GO_STYLE_OUTLINE | GO_STYLE_LINE | GO_STYLE_FILL)) != 0) {
- gui = go_libglade_new ("go-style-prefs.glade", "go_style_prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new ("go-style-prefs.glade", "go_style_prefs", GETTEXT_PACKAGE, cc);
if (gui == NULL) {
g_free (state);
return;
diff --git a/plugins/plot_barcol/gog-barcol-prefs.c b/plugins/plot_barcol/gog-barcol-prefs.c
index 5a6ce84..7b73017 100644
--- a/plugins/plot_barcol/gog-barcol-prefs.c
+++ b/plugins/plot_barcol/gog-barcol-prefs.c
@@ -45,7 +45,7 @@ gog_barcol_plot_pref (GogBarColPlot *barcol, GOCmdContext *cc)
char const *dir = go_plugin_get_dir_name (
go_plugins_get_plugin_by_id ("GOffice_plot_barcol"));
char *path = g_build_filename (dir, "gog-barcol-prefs.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "gog_barcol_prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "gog_barcol_prefs", GETTEXT_PACKAGE, cc);
g_free (path);
if (gui == NULL)
diff --git a/plugins/plot_barcol/gog-minmax.c b/plugins/plot_barcol/gog-minmax.c
index 9fae04e..835f3ac 100644
--- a/plugins/plot_barcol/gog-minmax.c
+++ b/plugins/plot_barcol/gog-minmax.c
@@ -181,7 +181,7 @@ gog_minmax_plot_populate_editor (GogObject *item,
char const *dir = go_plugin_get_dir_name (
go_plugins_get_plugin_by_id ("GOffice_plot_barcol"));
char *path = g_build_filename (dir, "gog-minmax-prefs.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "gog_minmax_prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "gog_minmax_prefs", GETTEXT_PACKAGE, cc);
g_free (path);
if (gui == NULL)
diff --git a/plugins/plot_distrib/gog-boxplot.c b/plugins/plot_distrib/gog-boxplot.c
index 8d82c9f..5a42768 100644
--- a/plugins/plot_distrib/gog-boxplot.c
+++ b/plugins/plot_distrib/gog-boxplot.c
@@ -110,7 +110,7 @@ gog_box_plot_pref (GogObject *obj,
char const *dir = go_plugin_get_dir_name (
go_plugins_get_plugin_by_id ("GOffice_plot_boxes"));
char *path = g_build_filename (dir, "gog-boxplot-prefs.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "gog_box_plot_prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "gog_box_plot_prefs", GETTEXT_PACKAGE, cc);
g_free (path);
if (gui == NULL)
diff --git a/plugins/plot_pie/gog-pie-prefs.c b/plugins/plot_pie/gog-pie-prefs.c
index e7fe3b8..0fb480d 100644
--- a/plugins/plot_pie/gog-pie-prefs.c
+++ b/plugins/plot_pie/gog-pie-prefs.c
@@ -40,7 +40,7 @@ gog_pie_series_element_pref (GogPieSeriesElement *element, GOCmdContext *cc)
char const *dir = go_plugin_get_dir_name (
go_plugins_get_plugin_by_id ("GOffice_plot_pie"));
char *path = g_build_filename (dir, "gog-pie-series.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "gog_pie_series_element_prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "gog_pie_series_element_prefs", GETTEXT_PACKAGE, cc);
g_free (path);
if (gui == NULL)
@@ -141,7 +141,7 @@ gog_pie_plot_pref (GogPiePlot *pie, GOCmdContext *cc)
GtkWidget *w;
char const *dir = go_plugin_get_dir_name (go_plugins_get_plugin_by_id ("GOffice_plot_pie"));
char *path = g_build_filename (dir, "gog-pie-prefs.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "gog_pie_prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "gog_pie_prefs", GETTEXT_PACKAGE, cc);
PiePrefState *state;
g_free (path);
@@ -185,7 +185,7 @@ gog_ring_plot_pref (GogRingPlot *ring, GOCmdContext *cc)
char const *dir = go_plugin_get_dir_name (
go_plugins_get_plugin_by_id ("GOffice_plot_pie"));
char *path = g_build_filename (dir, "gog-ring-prefs.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "gog_ring_prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "gog_ring_prefs", GETTEXT_PACKAGE, cc);
PiePrefState *state;
g_free (path);
diff --git a/plugins/plot_surface/gog-xyz-prefs.c b/plugins/plot_surface/gog-xyz-prefs.c
index 7c3d460..0b66c9b 100644
--- a/plugins/plot_surface/gog-xyz-prefs.c
+++ b/plugins/plot_surface/gog-xyz-prefs.c
@@ -41,7 +41,7 @@ gog_xyz_plot_pref (GogXYZPlot *plot, GOCmdContext *cc)
char const *dir = go_plugin_get_dir_name (
go_plugins_get_plugin_by_id ("GOffice_plot_surface"));
char *path = g_build_filename (dir, "gog-xyz-prefs.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "gog_xyz_prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "gog_xyz_prefs", GETTEXT_PACKAGE, cc);
g_free (path);
if (gui == NULL)
diff --git a/plugins/plot_surface/gog-xyz-surface-prefs.c b/plugins/plot_surface/gog-xyz-surface-prefs.c
index ce909f3..e92d7fc 100644
--- a/plugins/plot_surface/gog-xyz-surface-prefs.c
+++ b/plugins/plot_surface/gog-xyz-surface-prefs.c
@@ -48,7 +48,7 @@ gog_xyz_surface_plot_pref (GogXYZSurfacePlot *plot, GOCmdContext *cc)
char const *dir = go_plugin_get_dir_name (
go_plugins_get_plugin_by_id ("GOffice_plot_surface"));
char *path = g_build_filename (dir, "gog-xyz-surface-prefs.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "gog_xyz_surface_prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "gog_xyz_surface_prefs", GETTEXT_PACKAGE, cc);
g_free (path);
if (gui == NULL)
diff --git a/plugins/plot_xy/gog-bubble-prefs.c b/plugins/plot_xy/gog-bubble-prefs.c
index 0657099..22d2241 100644
--- a/plugins/plot_xy/gog-bubble-prefs.c
+++ b/plugins/plot_xy/gog-bubble-prefs.c
@@ -70,7 +70,7 @@ gog_bubble_plot_pref (GogBubblePlot *bubble, GOCmdContext *cc)
char const *dir = go_plugin_get_dir_name (
go_plugins_get_plugin_by_id ("GOffice_plot_xy"));
char *path = g_build_filename (dir, "gog-bubble-prefs.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "gog_bubble_prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "gog_bubble_prefs", GETTEXT_PACKAGE, cc);
g_free (path);
if (gui == NULL)
diff --git a/plugins/plot_xy/gog-xy.c b/plugins/plot_xy/gog-xy.c
index 7ff9571..3c13850 100644
--- a/plugins/plot_xy/gog-xy.c
+++ b/plugins/plot_xy/gog-xy.c
@@ -687,7 +687,7 @@ gog_xy_color_plot_populate_editor (GogObject *obj,
dir = go_plugin_get_dir_name (go_plugins_get_plugin_by_id ("GOffice_plot_xy"));
path = g_build_filename (dir, "gog-xy-color-prefs.glade", NULL);
- gui = go_libglade_new (path, "gog-xy-color-prefs", GETTEXT_PACKAGE, cc);
+ gui = go_glade_new (path, "gog-xy-color-prefs", GETTEXT_PACKAGE, cc);
g_free (path);
if (gui != NULL) {
@@ -1739,7 +1739,7 @@ gog_xy_series_populate_editor (GogObject *obj,
char const *dir = go_plugin_get_dir_name (
go_plugins_get_plugin_by_id ("GOffice_plot_xy"));
char *path = g_build_filename (dir, "gog-xy-series-prefs.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "gog_xy_series_prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "gog_xy_series_prefs", GETTEXT_PACKAGE, cc);
g_free (path);
diff --git a/plugins/smoothing/gog-exp-smooth.c b/plugins/smoothing/gog-exp-smooth.c
index e12db58..8eeea81 100644
--- a/plugins/smoothing/gog-exp-smooth.c
+++ b/plugins/smoothing/gog-exp-smooth.c
@@ -58,7 +58,7 @@ gog_exp_smooth_populate_editor (GogObject *obj,
char const *dir = go_plugin_get_dir_name (
go_plugins_get_plugin_by_id ("GOffice_smoothing"));
char *path = g_build_filename (dir, "gog-exp-smooth.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "exp-smooth-prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "exp-smooth-prefs", GETTEXT_PACKAGE, cc);
GtkWidget *label, *box, *w = glade_xml_get_widget (gui, "steps");
GtkTable *table;
diff --git a/plugins/smoothing/gog-moving-avg.c b/plugins/smoothing/gog-moving-avg.c
index eef87db..f82756c 100644
--- a/plugins/smoothing/gog-moving-avg.c
+++ b/plugins/smoothing/gog-moving-avg.c
@@ -99,7 +99,7 @@ gog_moving_avg_populate_editor (GogObject *obj,
char const *dir = go_plugin_get_dir_name (
go_plugins_get_plugin_by_id ("GOffice_smoothing"));
char *path = g_build_filename (dir, "gog-moving-avg.glade", NULL);
- GladeXML *gui = go_libglade_new (path, "mv-avg-prefs", GETTEXT_PACKAGE, cc);
+ GladeXML *gui = go_glade_new (path, "mv-avg-prefs", GETTEXT_PACKAGE, cc);
GtkWidget *w = glade_xml_get_widget (gui, "span");
go_widget_set_tooltip_text (w, _("Number of values from which to calculate an average"));
gtk_spin_button_set_range (GTK_SPIN_BUTTON (w), 2, G_MAXINT);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
