Commit 939c73ca authored by Jody Goldberg's avatar Jody Goldberg

Working distcheck - Fix the distcheckclean check in Makefile.am to

    Working distcheck
    - Fix the distcheckclean check in Makefile.am to workaround changes in automake
      kludge for scrollkeeper.
    - remove some deprecated gtk calls
    - make UI service descriptors translatable to allow a run from builddir to
      generate the docs.

svn path=/trunk/; revision=16770
parent 33589cd5
......@@ -70,7 +70,7 @@ distcleancheck_listfiles = \
# We are not able to uninstall the scrollkeeper files:
distuninstallcheck_listfiles = \
find . -type f -print -o -path ./var/scrollkeeper -prune
find . -type f -print -o -path */var/scrollkeeper -prune
## If I understand this correctly, this hack is needed only --with-perl:
if WITH_PERL
......
......@@ -5,5 +5,6 @@ Makefile.in
*.lo
*.la
plugin.xml
ui.xml
*.loT
*.sw*
......@@ -7,16 +7,15 @@ AM_CPPFLAGS = \
gnumeric_plugin_gnomedbdir = $(gnumeric_plugindir)/gnome-db
xmldir = $(gnumeric_plugin_gnomedbdir)
gnumeric_plugin_gnomedb_DATA = ui.xml
gnumeric_plugin_gnomedb_LTLIBRARIES = gnomedb.la
gnomedb_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS)
gnomedb_la_SOURCES = plugin-gnomedb.c
gnomedb_la_LIBADD = $(GDA_LIBS) $(GNOMEDB_LIBS)
xml_in_files = plugin.xml.in
xml_in_files = plugin.xml.in ui.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
EXTRA_DIST = $(xml_in_files) ui.xml
EXTRA_DIST = $(xml_in_files)
DISTCLEANFILES = $(xml_DATA)
......@@ -5,5 +5,6 @@
Makefile.in
Makefile
plugin.xml
ui-console-menu.xml
*.loT
*.sw*
......@@ -9,7 +9,6 @@ AM_CPPFLAGS = \
gnumeric_plugin_python_loaderdir = $(gnumeric_plugindir)/python-loader
xmldir = $(gnumeric_plugin_python_loaderdir)
gnumeric_plugin_python_loader_LTLIBRARIES = python_loader.la
gnumeric_plugin_python_loader_DATA = ui-console-menu.xml
python_loader_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS) $(GNM_PY_LDFLAGS)
python_loader_la_LIBADD = $(GNM_PY_LIBADD)
......@@ -30,10 +29,10 @@ python_loader_la_SOURCES = \
py-console.h \
boot.c
xml_in_files = plugin.xml.in
xml_in_files = plugin.xml.in ui-console-menu.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
EXTRA_DIST = $(xml_in_files) $(gnumeric_plugin_python_loader_DATA)
EXTRA_DIST = $(xml_in_files)
DISTCLEANFILES = $(xml_DATA)
......@@ -5,5 +5,6 @@ Makefile
*.lo
*.la
plugin.xml
hello.xml
*.loT
*.sw*
......@@ -6,15 +6,14 @@ AM_CPPFLAGS = \
gnumeric_plugin_testuidir = $(gnumeric_plugindir)/uihello
xmldir = $(gnumeric_plugin_testuidir)
gnumeric_plugin_testui_DATA = hello.xml
gnumeric_plugin_testui_LTLIBRARIES = plugin.la
plugin_la_LDFLAGS = -module $(GNUMERIC_PLUGIN_LDFLAGS)
plugin_la_SOURCES = uihello.c
xml_in_files = plugin.xml.in
xml_in_files = plugin.xml.in hello.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
EXTRA_DIST = $(xml_in_files) hello.xml
EXTRA_DIST = $(xml_in_files)
DISTCLEANFILES = $(xml_DATA)
......@@ -53,7 +53,7 @@ plugins/gda/plugin-gda.c
plugins/gda/plugin.xml.in
plugins/gnome-db/plugin-gnomedb.c
plugins/gnome-db/plugin.xml.in
plugins/gnome-db/ui.xml
plugins/gnome-db/ui.xml.in
plugins/gnome-glossary/plugin.xml.in
plugins/html/html_read.c
plugins/html/plugin.xml.in
......@@ -87,7 +87,7 @@ plugins/python-loader/plugin.xml.in
plugins/python-loader/py-console.c
plugins/python-loader/py-gnumeric.c
plugins/python-loader/python-loader.c
plugins/python-loader/ui-console-menu.xml
plugins/python-loader/ui-console-menu.xml.in
plugins/qpro/plugin.xml.in
plugins/qpro/qpro-read.c
plugins/sample_datasource/plugin.xml.in
......@@ -97,7 +97,7 @@ plugins/sc/sc.c
plugins/sylk/plugin.xml.in
plugins/sylk/sylk-write.c
plugins/sylk/sylk.c
plugins/uihello/hello.xml
plugins/uihello/hello.xml.in
plugins/uihello/plugin.xml.in
plugins/uihello/uihello.c
plugins/xbase/boot.c
......
......@@ -58,7 +58,7 @@ dialog_get_password (GtkWindow *parent, const char *filename)
gtk_box_pack_start (GTK_BOX (hb), image, FALSE, FALSE, 0);
vb = gtk_vbox_new (FALSE, 8);
gtk_box_pack_start (GTK_BOX (hb), vb, TRUE, TRUE, 6);
gtk_box_pack_start_defaults (GTK_BOX (vb), label);
gtk_box_pack_start (GTK_BOX (vb), label, TRUE, TRUE, 0);
pwb = gtk_hbox_new (FALSE, 8);
/* Strange width so that width of primary/secondary text will win. */
entry = g_object_new (GTK_TYPE_ENTRY,
......@@ -66,7 +66,7 @@ dialog_get_password (GtkWindow *parent, const char *filename)
"width-request", 1, NULL);
gtk_box_pack_start (GTK_BOX (pwb), gtk_label_new (_("Password :")),
FALSE, FALSE, 0);
gtk_box_pack_start_defaults (GTK_BOX (pwb), entry);
gtk_box_pack_start (GTK_BOX (pwb), entry, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vb), pwb, FALSE, FALSE, 0);
gtk_widget_show_all (d);
......
......@@ -205,7 +205,7 @@ dialog_paste_special (WBCGtk *wbcg)
g_signal_connect (G_OBJECT (r),
"toggled",
G_CALLBACK (cb_type_toggle), state);
gtk_box_pack_start_defaults (GTK_BOX (f1v), r);
gtk_box_pack_start (GTK_BOX (f1v), r, TRUE, TRUE, 0);
if (i == 0)
first_button = r;
}
......@@ -219,7 +219,7 @@ dialog_paste_special (WBCGtk *wbcg)
g_signal_connect (G_OBJECT (r),
"toggled",
G_CALLBACK (cb_op_toggle), state);
gtk_box_pack_start_defaults (GTK_BOX (op_box), r);
gtk_box_pack_start (GTK_BOX (op_box), r, TRUE, TRUE, 0);
}
hbox = gtk_hbox_new (TRUE, 0);
......@@ -228,18 +228,18 @@ dialog_paste_special (WBCGtk *wbcg)
g_signal_connect (G_OBJECT (state->transpose.btn),
"toggled",
G_CALLBACK (cb_transpose), state);
gtk_box_pack_start_defaults (GTK_BOX (hbox), state->transpose.btn);
gtk_box_pack_start (GTK_BOX (hbox), state->transpose.btn, TRUE, TRUE, 0);
state->skip_blanks.btn = gtk_check_button_new_with_mnemonic (_("Skip _Blanks"));
g_signal_connect (G_OBJECT (state->skip_blanks.btn),
"toggled",
G_CALLBACK (cb_skip_blanks), state);
gtk_box_pack_start_defaults (GTK_BOX (hbox), state->skip_blanks.btn);
gtk_box_pack_start (GTK_BOX (hbox), state->skip_blanks.btn, TRUE, TRUE, 0);
vbox = gtk_vbox_new (FALSE, 0);
gtk_box_pack_start_defaults (GTK_BOX (vbox), f1);
gtk_box_pack_start_defaults (GTK_BOX (vbox), state->op_frame);
gtk_box_pack_start_defaults (GTK_BOX (vbox), hbox);
gtk_box_pack_start (GTK_BOX (vbox), f1, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), state->op_frame, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (state->dialog->vbox), vbox, TRUE, TRUE, 0);
gtk_widget_show_all (vbox);
......
......@@ -702,7 +702,8 @@ stf_dialog_format_page_init (GladeXML *gui, StfDialogData *pagedata)
pagedata->format.column_selection_label = glade_xml_get_widget (gui, "column_selection_label");
format_hbox = glade_xml_get_widget (gui, "format_hbox");
gtk_box_pack_end_defaults (GTK_BOX (format_hbox), GTK_WIDGET (pagedata->format.format_selector));
gtk_box_pack_end (GTK_BOX (format_hbox),
GTK_WIDGET (pagedata->format.format_selector), TRUE, TRUE, 0);
gtk_widget_show (GTK_WIDGET (pagedata->format.format_selector));
pagedata->format.locale_selector =
......
......@@ -938,10 +938,8 @@ gnumeric_message_dialog_new (GtkWindow * parent,
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
gtk_box_pack_start_defaults (GTK_BOX (hbox),
label);
gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (dialog)->vbox),
hbox);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 0);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
......
......@@ -773,7 +773,7 @@ wbcg_edit_start (WBCGtk *wbcg,
align = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_container_add (GTK_CONTAINER (align), check);
gtk_widget_show_all (align);
gtk_box_pack_end_defaults (GTK_BOX (GTK_DIALOG (d)->vbox), align);
gtk_box_pack_end (GTK_BOX (GTK_DIALOG (d)->vbox), align, TRUE, TRUE, 0);
res = go_gtk_dialog_run (GTK_DIALOG (d), wbcg_toplevel (wbcg));
switch (res) {
......
......@@ -386,8 +386,8 @@ fs_init (FontSelector *fs)
gnm_style_set_align_h (fs->mstyle, HALIGN_CENTER);
gnm_style_set_font_size (fs->mstyle, 10);
gtk_box_pack_start_defaults (GTK_BOX (fs),
glade_xml_get_widget (fs->gui, "toplevel-table"));
gtk_box_pack_start (GTK_BOX (fs),
glade_xml_get_widget (fs->gui, "toplevel-table"), TRUE, TRUE, 0);
fs->font_name_entry = glade_xml_get_widget (fs->gui, "font-name-entry");
fs->font_style_entry = glade_xml_get_widget (fs->gui, "font-style-entry");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment