GNOME.org
 

gnumeric r16770 - in trunk: . plugins/gnome-db plugins/python-loader plugins/uihello po src src/dialogs src/widgets

Author: jody
Date: Tue Sep  2 00:43:52 2008
New Revision: 16770
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16770&view=rev

Log:
    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.

Added:
   trunk/plugins/gnome-db/ui.xml.in
      - copied, changed from r16769, /trunk/plugins/gnome-db/ui.xml
   trunk/plugins/python-loader/ui-console-menu.xml.in
      - copied, changed from r16769, /trunk/plugins/python-loader/ui-console-menu.xml
   trunk/plugins/uihello/hello.xml.in
      - copied, changed from r16769, /trunk/plugins/uihello/hello.xml
Removed:
   trunk/plugins/gnome-db/ui.xml
   trunk/plugins/python-loader/ui-console-menu.xml
   trunk/plugins/uihello/hello.xml
Modified:
   trunk/Makefile.am
   trunk/plugins/gnome-db/.gitignore
   trunk/plugins/gnome-db/Makefile.am
   trunk/plugins/python-loader/.gitignore
   trunk/plugins/python-loader/Makefile.am
   trunk/plugins/uihello/.gitignore
   trunk/plugins/uihello/Makefile.am
   trunk/po/POTFILES.in
   trunk/src/dialogs/dialog-password.c
   trunk/src/dialogs/dialog-paste-special.c
   trunk/src/dialogs/dialog-stf-format-page.c
   trunk/src/gui-util.c
   trunk/src/wbc-gtk-edit.c
   trunk/src/widgets/widget-font-selector.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Sep  2 00:43:52 2008
@@ -70,7 +70,7 @@
 
 # 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

Modified: trunk/plugins/gnome-db/.gitignore
==============================================================================
--- trunk/plugins/gnome-db/.gitignore	(original)
+++ trunk/plugins/gnome-db/.gitignore	Tue Sep  2 00:43:52 2008
@@ -5,5 +5,6 @@
 *.lo
 *.la
 plugin.xml
+ui.xml
 *.loT
 *.sw*

Modified: trunk/plugins/gnome-db/Makefile.am
==============================================================================
--- trunk/plugins/gnome-db/Makefile.am	(original)
+++ trunk/plugins/gnome-db/Makefile.am	Tue Sep  2 00:43:52 2008
@@ -7,16 +7,15 @@
 
 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)

Copied: trunk/plugins/gnome-db/ui.xml.in (from r16769, /trunk/plugins/gnome-db/ui.xml)
==============================================================================

Modified: trunk/plugins/python-loader/.gitignore
==============================================================================
--- trunk/plugins/python-loader/.gitignore	(original)
+++ trunk/plugins/python-loader/.gitignore	Tue Sep  2 00:43:52 2008
@@ -5,5 +5,6 @@
 Makefile.in
 Makefile
 plugin.xml
+ui-console-menu.xml
 *.loT
 *.sw*

Modified: trunk/plugins/python-loader/Makefile.am
==============================================================================
--- trunk/plugins/python-loader/Makefile.am	(original)
+++ trunk/plugins/python-loader/Makefile.am	Tue Sep  2 00:43:52 2008
@@ -9,7 +9,6 @@
 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 @@
 	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)

Copied: trunk/plugins/python-loader/ui-console-menu.xml.in (from r16769, /trunk/plugins/python-loader/ui-console-menu.xml)
==============================================================================

Modified: trunk/plugins/uihello/.gitignore
==============================================================================
--- trunk/plugins/uihello/.gitignore	(original)
+++ trunk/plugins/uihello/.gitignore	Tue Sep  2 00:43:52 2008
@@ -5,5 +5,6 @@
 *.lo
 *.la
 plugin.xml
+hello.xml
 *.loT
 *.sw*

Modified: trunk/plugins/uihello/Makefile.am
==============================================================================
--- trunk/plugins/uihello/Makefile.am	(original)
+++ trunk/plugins/uihello/Makefile.am	Tue Sep  2 00:43:52 2008
@@ -6,15 +6,14 @@
 
 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)

Copied: trunk/plugins/uihello/hello.xml.in (from r16769, /trunk/plugins/uihello/hello.xml)
==============================================================================

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue Sep  2 00:43:52 2008
@@ -53,7 +53,7 @@
 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/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/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

Modified: trunk/src/dialogs/dialog-password.c
==============================================================================
--- trunk/src/dialogs/dialog-password.c	(original)
+++ trunk/src/dialogs/dialog-password.c	Tue Sep  2 00:43:52 2008
@@ -58,7 +58,7 @@
 	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 @@
 			      "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);
 

Modified: trunk/src/dialogs/dialog-paste-special.c
==============================================================================
--- trunk/src/dialogs/dialog-paste-special.c	(original)
+++ trunk/src/dialogs/dialog-paste-special.c	Tue Sep  2 00:43:52 2008
@@ -205,7 +205,7 @@
 		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 @@
 		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 @@
 	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);

Modified: trunk/src/dialogs/dialog-stf-format-page.c
==============================================================================
--- trunk/src/dialogs/dialog-stf-format-page.c	(original)
+++ trunk/src/dialogs/dialog-stf-format-page.c	Tue Sep  2 00:43:52 2008
@@ -702,7 +702,8 @@
 	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 =

Modified: trunk/src/gui-util.c
==============================================================================
--- trunk/src/gui-util.c	(original)
+++ trunk/src/gui-util.c	Tue Sep  2 00:43:52 2008
@@ -938,10 +938,8 @@
 
 		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);

Modified: trunk/src/wbc-gtk-edit.c
==============================================================================
--- trunk/src/wbc-gtk-edit.c	(original)
+++ trunk/src/wbc-gtk-edit.c	Tue Sep  2 00:43:52 2008
@@ -773,7 +773,7 @@
 		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) {

Modified: trunk/src/widgets/widget-font-selector.c
==============================================================================
--- trunk/src/widgets/widget-font-selector.c	(original)
+++ trunk/src/widgets/widget-font-selector.c	Tue Sep  2 00:43:52 2008
@@ -386,8 +386,8 @@
 	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");
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]