--- a/patches/dia-04-gtk-spin-button.diff Tue May 05 10:59:38 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,303 +0,0 @@
-/jds/bin/diff -uprN dia-0.96.1.old/app/dia-props.c dia-0.96.1/app/dia-props.c
---- dia-0.96.1.old/app/dia-props.c 2008-12-02 17:23:16.391323000 +0000
-+++ dia-0.96.1/app/dia-props.c 2008-12-03 10:15:22.515100000 +0000
-@@ -139,14 +139,14 @@ create_diagram_properties_dialog(Diagram
- GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show(label);
-
-- adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 10.0, 0.1, 10.0, 10.0));
-+ adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 10.0, 0.1, 10.0, 0));
- width_x_entry = gtk_spin_button_new(adj, 1.0, 3);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(width_x_entry), TRUE);
- gtk_table_attach(GTK_TABLE(table), width_x_entry, 1,2, 2,3,
- GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
- gtk_widget_show(width_x_entry);
-
-- adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 10.0, 0.1, 10.0, 10.0));
-+ adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 10.0, 0.1, 10.0, 0));
- width_y_entry = gtk_spin_button_new(adj, 1.0, 3);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(width_y_entry), TRUE);
- gtk_table_attach(GTK_TABLE(table), width_y_entry, 2,3, 2,3,
-@@ -159,14 +159,14 @@ create_diagram_properties_dialog(Diagram
- GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show(label);
-
-- adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 10.0));
-+ adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 0));
- visible_x_entry = gtk_spin_button_new(adj, 1.0, 0);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(visible_x_entry), TRUE);
- gtk_table_attach(GTK_TABLE(table), visible_x_entry, 1,2, 3,4,
- GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
- gtk_widget_show(visible_x_entry);
-
-- adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 10.0));
-+ adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 0));
- visible_y_entry = gtk_spin_button_new(adj, 1.0, 0);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(visible_y_entry), TRUE);
- gtk_table_attach(GTK_TABLE(table), visible_y_entry, 2,3, 3,4,
-@@ -188,7 +188,7 @@ create_diagram_properties_dialog(Diagram
- GTK_FILL, GTK_FILL, 0, 0);
- gtk_widget_show(label);
-
-- adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 10.0));
-+ adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.0, 100.0, 1.0, 10.0, 0));
- hex_size_entry = gtk_spin_button_new(adj, 1.0, 0);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(hex_size_entry), TRUE);
- gtk_table_attach(GTK_TABLE(table), hex_size_entry, 1,2, 5,6,
-/jds/bin/diff -uprN dia-0.96.1.old/app/dialogs.c dia-0.96.1/app/dialogs.c
---- dia-0.96.1.old/app/dialogs.c 2008-12-02 17:23:16.393717000 +0000
-+++ dia-0.96.1/app/dialogs.c 2008-12-03 10:41:28.733781000 +0000
-@@ -66,7 +66,7 @@ GtkSpinButton *
- dialog_add_spinbutton(GtkWidget *dialog, char *title,
- real min, real max, real decimals) {
- GtkAdjustment *limits =
-- GTK_ADJUSTMENT(gtk_adjustment_new(10.0, min, max, 1.0, 10.0, 100.0));
-+ GTK_ADJUSTMENT(gtk_adjustment_new(10.0, min, max, 1.0, 10.0, 0));
- GtkWidget *box = gtk_hbox_new(FALSE, 10);
- GtkWidget *label = gtk_label_new(title);
- GtkWidget *entry = gtk_spin_button_new(limits, 10.0, decimals);
-/jds/bin/diff -uprN dia-0.96.1.old/app/diapagelayout.c dia-0.96.1/app/diapagelayout.c
---- dia-0.96.1.old/app/diapagelayout.c 2008-12-02 17:23:16.390570000 +0000
-+++ dia-0.96.1/app/diapagelayout.c 2008-12-03 10:36:27.634596000 +0000
-@@ -203,7 +203,7 @@ dia_page_layout_init(DiaPageLayout *self
- gtk_widget_show(wid);
-
- self->tmargin = dia_unit_spinner_new(
-- GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,10)),
-+ GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,0)),
- 2, DIA_UNIT_CENTIMETER);
- gtk_table_attach(GTK_TABLE(table), self->tmargin, 1,2, 0,1,
- GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
-@@ -216,7 +216,7 @@ dia_page_layout_init(DiaPageLayout *self
- gtk_widget_show(wid);
-
- self->bmargin = dia_unit_spinner_new(
-- GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,10)),
-+ GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,0)),
- 2, DIA_UNIT_CENTIMETER);
- gtk_table_attach(GTK_TABLE(table), self->bmargin, 1,2, 1,2,
- GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
-@@ -229,7 +229,7 @@ dia_page_layout_init(DiaPageLayout *self
- gtk_widget_show(wid);
-
- self->lmargin = dia_unit_spinner_new(
-- GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,10)),
-+ GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,0)),
- 2, DIA_UNIT_CENTIMETER);
- gtk_table_attach(GTK_TABLE(table), self->lmargin, 1,2, 2,3,
- GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
-@@ -242,7 +242,7 @@ dia_page_layout_init(DiaPageLayout *self
- gtk_widget_show(wid);
-
- self->rmargin = dia_unit_spinner_new(
-- GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,10)),
-+ GTK_ADJUSTMENT(gtk_adjustment_new(1, 0,100, 0.1,10,0)),
- 2, DIA_UNIT_CENTIMETER);
- gtk_table_attach(GTK_TABLE(table), self->rmargin, 1,2, 3,4,
- GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
-@@ -266,7 +266,7 @@ dia_page_layout_init(DiaPageLayout *self
- gtk_widget_show(self->scale);
-
- self->scaling = gtk_spin_button_new(
-- GTK_ADJUSTMENT(gtk_adjustment_new(100,1,10000, 1,10,10)), 1, 1);
-+ GTK_ADJUSTMENT(gtk_adjustment_new(100,1,10000, 1,10,10)), 1, 0);
- gtk_table_attach(GTK_TABLE(table), self->scaling, 1,4, 0,1,
- GTK_FILL|GTK_EXPAND, GTK_FILL|GTK_EXPAND, 0, 0);
- gtk_widget_show(self->scaling);
-/jds/bin/diff -uprN dia-0.96.1.old/app/preferences.c dia-0.96.1/app/preferences.c
---- dia-0.96.1.old/app/preferences.c 2008-12-02 17:23:16.372512000 +0000
-+++ dia-0.96.1/app/preferences.c 2008-12-03 10:36:44.441969000 +0000
-@@ -406,7 +406,7 @@ prefs_get_property_widget(DiaPrefData *d
- case PREF_INT:
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0,
- G_MININT, G_MAXINT,
-- 1.0, 10.0, 10.0 ));
-+ 1.0, 10.0, 0 ));
- widget = gtk_spin_button_new (adj, 1.0, 0);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(widget), TRUE);
- gtk_widget_set_usize(widget, 80, -1);
-@@ -414,7 +414,7 @@ prefs_get_property_widget(DiaPrefData *d
- case PREF_UINT:
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0,
- 0.0, G_MAXINT,
-- 1.0, 10.0, 10.0 ));
-+ 1.0, 10.0, 0 ));
- widget = gtk_spin_button_new (adj, 1.0, 0);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(widget), TRUE);
- gtk_widget_set_usize(widget, 80, -1);
-@@ -422,7 +422,7 @@ prefs_get_property_widget(DiaPrefData *d
- case PREF_REAL:
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0,
- G_MINFLOAT, G_MAXFLOAT,
-- 1.0, 10.0, 10.0 ));
-+ 1.0, 10.0, 0 ));
- widget = gtk_spin_button_new (adj, 1.0, 3);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(widget), TRUE);
- gtk_widget_set_usize(widget, 80, -1);
-@@ -430,7 +430,7 @@ prefs_get_property_widget(DiaPrefData *d
- case PREF_UREAL:
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(0.0,
- 0.0, G_MAXFLOAT,
-- 1.0, 10.0, 10.0 ));
-+ 1.0, 10.0, 0 ));
- widget = gtk_spin_button_new (adj, 1.0, 3);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(widget), TRUE);
- gtk_widget_set_usize(widget, 80, -1);
-/jds/bin/diff -uprN dia-0.96.1.old/lib/prop_geomtypes.c dia-0.96.1/lib/prop_geomtypes.c
---- dia-0.96.1.old/lib/prop_geomtypes.c 2008-12-02 17:23:12.143764000 +0000
-+++ dia-0.96.1/lib/prop_geomtypes.c 2008-12-03 10:39:18.033980000 +0000
-@@ -69,7 +69,7 @@ realprop_get_widget(RealProperty *prop,
- GtkAdjustment *adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->real_data,
- G_MINFLOAT,
- G_MAXFLOAT,
-- 0.1, 1.0, 1.0));
-+ 0.1, 1.0, 0));
- GtkWidget *ret = gtk_spin_button_new(adj, 1.0, 2);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ret),TRUE);
- prophandler_connect(&prop->common,GTK_OBJECT(adj),"value_changed");
-@@ -87,11 +87,11 @@ realprop_reset_widget(RealProperty *prop
- numdata->min, numdata->max,
- numdata->step,
- 10.0 * numdata->step,
-- 10.0 * numdata->step));
-+ 0));
- } else {
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->real_data,
- G_MINFLOAT, G_MAXFLOAT,
-- 0.1, 1.0, 1.0));
-+ 0.1, 1.0, 0));
- }
- gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(widget), adj);
- }
-@@ -180,7 +180,7 @@ lengthprop_get_widget(LengthProperty *pr
- GtkAdjustment *adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->length_data,
- G_MINFLOAT,
- G_MAXFLOAT,
-- 0.1, 1.0, 1.0));
-+ 0.1, 1.0, 0));
- GtkWidget *ret = dia_unit_spinner_new(adj, 2, DIA_UNIT_CENTIMETER);
- /* gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ret),TRUE);*/
- prophandler_connect(&prop->common,GTK_OBJECT(adj),"value_changed");
-@@ -199,11 +199,11 @@ lengthprop_reset_widget(LengthProperty *
- numdata->min, numdata->max,
- numdata->step,
- 10.0 * numdata->step,
-- 10.0 * numdata->step));
-+ 0));
- } else {
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->length_data,
- G_MINFLOAT, G_MAXFLOAT,
-- 0.1, 1.0, 1.0));
-+ 0.1, 1.0, 0));
- }
- dia_unit_spinner_set_adjustment(GTK_SPIN_BUTTON(widget), adj);
- */
-@@ -295,7 +295,7 @@ fontsizeprop_get_widget(FontsizeProperty
- GtkAdjustment *adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->fontsize_data,
- G_MINFLOAT,
- G_MAXFLOAT,
-- 0.1, 1.0, 1.0));
-+ 0.1, 1.0, 0));
- GtkWidget *ret = dia_unit_spinner_new(adj, 2, DIA_UNIT_POINT);
- /* gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ret),TRUE);*/
- prophandler_connect(&prop->common,GTK_OBJECT(adj),"value_changed");
-@@ -314,11 +314,11 @@ fontsizeprop_reset_widget(FontsizeProper
- numdata->min, numdata->max,
- numdata->step,
- 10.0 * numdata->step,
-- 10.0 * numdata->step));
-+ 0));
- } else {
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->fontsize_data,
- G_MINFLOAT, G_MAXFLOAT,
-- 0.1, 1.0, 1.0));
-+ 0.1, 1.0, 0));
- }
- gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(widget), adj);
- */
-/jds/bin/diff -uprN dia-0.96.1.old/lib/prop_inttypes.c dia-0.96.1/lib/prop_inttypes.c
---- dia-0.96.1.old/lib/prop_inttypes.c 2008-12-02 17:23:12.143558000 +0000
-+++ dia-0.96.1/lib/prop_inttypes.c 2008-12-03 10:17:24.393757000 +0000
-@@ -280,7 +280,7 @@ intprop_get_widget(IntProperty *prop, Pr
- {
- GtkAdjustment *adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->int_data,
- G_MININT, G_MAXINT,
-- 1.0, 10.0, 10.0));
-+ 1.0, 10.0, 0));
- GtkWidget *ret = gtk_spin_button_new(adj, 1.0, 0);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ret),TRUE);
- prophandler_connect(&prop->common,GTK_OBJECT(adj),"value_changed");
-@@ -297,11 +297,11 @@ intprop_reset_widget(IntProperty *prop,
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->int_data,
- numdata->min, numdata->max,
- numdata->step, 10.0 * numdata->step,
-- 10.0 * numdata->step));
-+ 0));
- } else {
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(prop->int_data,
- G_MININT, G_MAXINT,
-- 1.0, 10.0, 10.0));
-+ 1.0, 10.0, 0));
- }
- gtk_spin_button_set_adjustment(GTK_SPIN_BUTTON(widget), adj);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(widget), TRUE);
-/jds/bin/diff -uprN dia-0.96.1.old/lib/widgets.c dia-0.96.1/lib/widgets.c
---- dia-0.96.1.old/lib/widgets.c 2008-12-02 17:23:12.141938000 +0000
-+++ dia-0.96.1/lib/widgets.c 2008-12-03 10:17:07.405589000 +0000
-@@ -149,7 +149,7 @@ dia_size_selector_init (DiaSizeSelector
- ss->ratio = 0.0;
- /* Here's where we set up the real thing */
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.01, 10,
-- 0.1, 1.0, 1.0));
-+ 0.1, 1.0, 0));
- ss->width = GTK_SPIN_BUTTON(gtk_spin_button_new(adj, 1.0, 2));
- gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(ss->width), TRUE);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ss->width), TRUE);
-@@ -157,7 +157,7 @@ dia_size_selector_init (DiaSizeSelector
- gtk_widget_show(GTK_WIDGET(ss->width));
-
- adj = GTK_ADJUSTMENT(gtk_adjustment_new(1.0, 0.01, 10,
-- 0.1, 1.0, 1.0));
-+ 0.1, 1.0, 0));
- ss->height = GTK_SPIN_BUTTON(gtk_spin_button_new(adj, 1.0, 2));
- gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(ss->height), TRUE);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(ss->height), TRUE);
-@@ -831,7 +831,7 @@ dia_line_style_selector_init (DiaLineSty
- gtk_box_pack_start_defaults(GTK_BOX(box), label);
- gtk_widget_show(label);
-
-- adj = (GtkAdjustment *)gtk_adjustment_new(0.1, 0.00, 10.0, 0.1, 1.0, 1.0);
-+ adj = (GtkAdjustment *)gtk_adjustment_new(0.1, 0.00, 10.0, 0.1, 1.0, 0);
- length = gtk_spin_button_new(adj, DEFAULT_LINESTYLE_DASHLEN, 2);
- gtk_spin_button_set_wrap(GTK_SPIN_BUTTON(length), TRUE);
- gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(length), TRUE);
-/jds/bin/diff -uprN dia-0.96.1.old/objects/UML/class_dialog.c dia-0.96.1/objects/UML/class_dialog.c
---- dia-0.96.1.old/objects/UML/class_dialog.c 2008-12-02 17:23:12.825073000 +0000
-+++ dia-0.96.1/objects/UML/class_dialog.c 2008-12-03 10:19:58.397673000 +0000
-@@ -255,7 +255,7 @@ create_font_props_row (GtkTable *table
- dia_font_selector_set_font (DIAFONTSELECTOR (*fontsel), font);
- gtk_table_attach_defaults (GTK_TABLE (table), GTK_WIDGET(*fontsel), 1, 2, row, row+1);
-
-- adj = gtk_adjustment_new (height, 0.1, 10.0, 0.1, 1.0, 1.0);
-+ adj = gtk_adjustment_new (height, 0.1, 10.0, 0.1, 1.0, 0);
- *heightsel = GTK_SPIN_BUTTON (gtk_spin_button_new (GTK_ADJUSTMENT(adj), 1.0, 2));
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (*heightsel), TRUE);
- gtk_table_attach_defaults (table, GTK_WIDGET (*heightsel), 2, 3, row, row+1);
-@@ -349,7 +349,7 @@ class_create_page(GtkNotebook *notebook,
- checkbox = gtk_check_button_new_with_label(_("Wrap Operations"));
- prop_dialog->op_wrap = GTK_TOGGLE_BUTTON( checkbox );
- gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
-- adj = gtk_adjustment_new( umlclass->wrap_after_char, 0.0, 200.0, 1.0, 5.0, 1.0);
-+ adj = gtk_adjustment_new( umlclass->wrap_after_char, 0.0, 200.0, 1.0, 5.0, 0);
- prop_dialog->wrap_after_char = GTK_SPIN_BUTTON(gtk_spin_button_new( GTK_ADJUSTMENT( adj), 0.1, 0));
- gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( prop_dialog->wrap_after_char), TRUE);
- gtk_spin_button_set_snap_to_ticks( GTK_SPIN_BUTTON( prop_dialog->wrap_after_char), TRUE);
-@@ -364,7 +364,7 @@ class_create_page(GtkNotebook *notebook,
- checkbox = gtk_check_button_new_with_label(_("Comments visible"));
- prop_dialog->comments_vis = GTK_TOGGLE_BUTTON( checkbox );
- gtk_box_pack_start (GTK_BOX (hbox), checkbox, TRUE, TRUE, 0);
-- adj = gtk_adjustment_new( umlclass->comment_line_length, 17.0, 200.0, 1.0, 5.0, 1.0);
-+ adj = gtk_adjustment_new( umlclass->comment_line_length, 17.0, 200.0, 1.0, 5.0, 0);
- prop_dialog->comment_line_length = GTK_SPIN_BUTTON(gtk_spin_button_new( GTK_ADJUSTMENT( adj), 0.1, 0));
- gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( prop_dialog->comment_line_length), TRUE);
- gtk_spin_button_set_snap_to_ticks( GTK_SPIN_BUTTON( prop_dialog->comment_line_length), TRUE);
--- a/patches/dia-06-goption.diff Tue May 05 10:59:38 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,244 +0,0 @@
---- trunk/app/app_procs.c 2007/10/28 10:23:23 3838
-+++ trunk/app/app_procs.c 2008/03/04 20:32:19 3897
-@@ -37,27 +37,8 @@
- #include <gtk/gtk.h>
- #include <gmodule.h>
-
--#if (defined (HAVE_LIBPOPT) && defined (HAVE_POPT_H)) || defined (GNOME)
--#define HAVE_POPT
--#endif
--
- #ifdef GNOME
- #include <gnome.h>
--#else
--# ifdef HAVE_POPT_H
--# include <popt.h>
--# else
--/* sorry about the mess, but one should not use conditional defined types in
-- * unconditional function call in the first place ... --hb */
--typedef void* poptContext;
--# endif
--#endif
--
--/* apparently there is no clean way to use glib-2.6 GOption with gnome */
--#if GLIB_CHECK_VERSION(2,5,5) && !defined GNOME
--# define USE_GOPTION 1
--#else
--# define USE_GOPTION 0
- #endif
-
- #ifdef HAVE_FREETYPE
-@@ -114,12 +95,8 @@
-
- static void create_user_dirs(void);
- static PluginInitResult internal_plugin_init(PluginInfo *info);
--static void process_opts(int argc, char **argv,
--#if USE_GOPTION
-+static void process_opts(int *argc, char **argv,
- GOptionContext* context, GOptionEntry options[],
--#elif defined HAVE_POPT
-- poptContext poptCtx, struct poptOption options[],
--#endif
- GSList **files, char **export_file_name,
- char **export_file_format, char **size,
- char **show_layers, gboolean *nosplash);
-@@ -697,7 +674,6 @@
- "shape, svg, tex, " WMF
- "wpg");
-
--#if USE_GOPTION
- GOptionContext *context = NULL;
- static GOptionEntry options[] =
- {
-@@ -724,49 +700,12 @@
- N_("Display version and exit"), NULL },
- { NULL }
- };
--#elif defined HAVE_POPT
-- poptContext context = NULL;
-- struct poptOption options[] =
-- {
-- {"export", 'e', POPT_ARG_STRING, NULL /* &export_file_name */, 0,
-- N_("Export loaded file and exit"), N_("OUTPUT")},
-- {"filter",'t', POPT_ARG_STRING, NULL /* &export_file_format */,
-- 0, export_format_string, N_("TYPE")
-- },
-- {"size", 's', POPT_ARG_STRING, NULL, 0,
-- N_("Export graphics size"), N_("WxH")},
-- {"show-layers", 'L', POPT_ARG_STRING, NULL, 0, /* 13.3.2004 [email protected] */
-- N_("Show only specified layers (e.g. when exporting). Can be either the layer name or a range of layer numbers (X-Y)"),
-- N_("LAYER,LAYER,...")},
-- {"nosplash", 'n', POPT_ARG_NONE, &nosplash, 0,
-- N_("Don't show the splash screen"), NULL },
-- {"nonew", 'n', POPT_ARG_NONE, &nonew, 0,
-- N_("Don't create empty diagram"), NULL },
-- {"log-to-stderr", 'l', POPT_ARG_NONE, &log_to_stderr, 0,
-- N_("Send error messages to stderr instead of showing dialogs."), NULL },
-- {"credits", 'c', POPT_ARG_NONE, &credits, 0,
-- N_("Display credits list and exit"), NULL },
-- {"verbose", 0, POPT_ARG_NONE, &verbose, 0,
-- N_("Generate verbose output"), NULL },
-- {"version", 'v', POPT_ARG_NONE, &version, 0,
-- N_("Display version and exit"), NULL },
-- {"help", 'h', POPT_ARG_NONE, 0, 1, N_("Show this help message") },
-- {(char *) NULL, '\0', 0, NULL, 0}
-- };
--#endif
-
--#if USE_GOPTION
- options[0].arg_data = &export_file_name;
- options[1].arg_data = &export_file_format;
- options[1].description = export_format_string;
- options[2].arg_data = &size;
- options[3].arg_data = &show_layers;
--#elif defined HAVE_POPT
-- options[0].arg = &export_file_name;
-- options[1].arg = &export_file_format;
-- options[2].arg = &size;
-- options[3].arg = &show_layers;
--#endif
-
- argv0 = (argc > 0) ? argv[0] : "(none)";
-
-@@ -786,12 +725,10 @@
- #endif
- textdomain(GETTEXT_PACKAGE);
-
-- process_opts(argc, argv,
--#if defined HAVE_POPT || USE_GOPTION
-+ process_opts(&argc, argv,
- context, options,
--#endif
- &files,
-- &export_file_name, &export_file_format, &size, &show_layers, &nosplash);
-+ &export_file_name, &export_file_format, &size, &show_layers, &nosplash);
-
- #if defined ENABLE_NLS && defined HAVE_BIND_TEXTDOMAIN_CODESET
- bind_textdomain_codeset(GETTEXT_PACKAGE,"UTF-8");
-@@ -804,10 +741,9 @@
- gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE,
- argc, argv,
- /* haven't found a quick way to pass GOption here */
-- GNOME_PARAM_POPT_TABLE, options,
-+ GNOME_PARAM_GOPTION_CONTEXT, context,
- GNOME_PROGRAM_STANDARD_PROPERTIES,
- GNOME_PARAM_NONE);
-- g_object_get(program, "popt-context", &context, NULL);
- client = gnome_master_client();
- if(client == NULL) {
- g_warning(_("Can't connect to session manager!\n"));
-@@ -1214,53 +1150,20 @@
-
- /* Note: running in locale encoding */
- static void
--process_opts(int argc, char **argv,
--#if USE_GOPTION
-+process_opts(int *argc, char **argv,
- GOptionContext *context, GOptionEntry options[],
--#elif defined HAVE_POPT
-- poptContext poptCtx, struct poptOption options[],
--#endif
- GSList **files, char **export_file_name,
- char **export_file_format, char **size,
- char **show_layers, gboolean* nosplash)
- {
--#if defined HAVE_POPT && !USE_GOPTION
-- int rc = 0;
-- poptCtx = poptGetContext(PACKAGE, argc, (const char **)argv, options, 0);
-- poptSetOtherOptionHelp(poptCtx, _("[OPTION...] [FILE...]"));
-- while (rc >= 0) {
-- if((rc = poptGetNextOpt(poptCtx)) < -1) {
-- fprintf(stderr,_("Error on option %s: %s.\nRun '%s --help' to see a full list of available command line options.\n"),
-- poptBadOption(poptCtx, 0),
-- poptStrerror(rc),
-- argv[0]);
-- exit(1);
-- }
-- if(rc == 1) {
-- poptPrintHelp(poptCtx, stderr, 0);
-- exit(0);
-- }
-- }
--#endif
- if (argv) {
--#if defined HAVE_POPT && !USE_GOPTION
-- while (poptPeekArg(poptCtx)) {
-- char *in_file_name = (char *)poptGetArg(poptCtx);
-- if (*in_file_name != '\0')
-- *files = g_slist_append(*files, in_file_name);
-- }
-- poptFreeContext(poptCtx);
--#elif USE_GOPTION
- GError *error = NULL;
- int i;
-
- context = g_option_context_new(_("[FILE...]"));
- g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
--# if GTK_CHECK_VERSION(2,5,7)
-- /* at least Gentoo was providing GLib-2.6 but Gtk+-2.4.14 */
-- g_option_context_add_group (context, gtk_get_option_group (FALSE));
--# endif
-- if (!g_option_context_parse (context, &argc, &argv, &error)) {
-+
-+ if (!g_option_context_parse (context, argc, &argv, &error)) {
- if (error) { /* IMO !error here is a bug upstream, triggered with --gdk-debug=updates */
- g_print ("%s", error->message);
- g_error_free (error);
-@@ -1271,11 +1174,11 @@
- g_option_context_free(context);
- exit(0);
- }
-- if (argc < 2) {
-+ if (*argc < 2) {
- g_option_context_free(context);
- return;
- }
-- for (i = 1; i < argc; i++) {
-+ for (i = 1; i < *argc; i++) {
- if (!g_file_test (argv[i], G_FILE_TEST_IS_REGULAR)) {
- g_print (_("'%s' not found!\n"), argv[i]);
- g_option_context_free(context);
-@@ -1284,43 +1187,6 @@
- *files = g_slist_append(*files, argv[i]);
- }
- g_option_context_free(context);
--#else
-- int i;
--
-- for (i=1; i<argc; i++) {
-- char *in_file_name = argv[i]; /* unless it's an option... */
--
-- if (0==strcmp(argv[i],"-t")) {
-- if (i < (argc-1)) {
-- i++;
-- *export_file_format = argv[i];
-- continue;
-- }
-- } else if (0 == strcmp(argv[i],"-e")) {
-- if (i < (argc-1)) {
-- i++;
-- *export_file_name = argv[i];
-- continue;
-- }
-- } else if (0 == strcmp(argv[i],"-s")) {
-- if (i < (argc-1)) {
-- i++;
-- *size = argv[i];
-- continue;
-- }
-- } else if (0 == strcmp(argv[i],"-L")) {
-- if (i < (argc-1)) {
-- i++;
-- *show_layers = argv[i];
-- continue;
-- }
-- } else if (0 == strcmp(argv[i],"-n")) {
-- *nosplash = 1;
-- continue;
-- }
-- *files = g_slist_append(*files, in_file_name);
-- }
--#endif
- }
- if (*export_file_name || *export_file_format || *size)
- dia_is_interactive = FALSE;