[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.6.1-20100214-231-gd880321)
The branch, master has been updated
via d8803215ea591b9349999c17c5a85aee7da473af (commit)
via eaaa0acc2c5f61c51ba4a7a595c23001446aa4fc (commit)
from d1569f38123674ffa71b0160cd0fb56806673c84 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
configure.ac | 1 -
gschem/src/gschem.c | 7 ++++---
gschem/src/x_dialog.c | 3 ++-
gschem/src/x_menus.c | 6 +++++-
libgeda/src/libgeda.c | 2 ++
5 files changed, 13 insertions(+), 6 deletions(-)
=================
Commit Messages
=================
commit d8803215ea591b9349999c17c5a85aee7da473af
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Remove warnings when building with "--disable-nls".
Closes-bug: lp-698450
:100644 100644 fec69c0... f2150a3... M gschem/src/gschem.c
:100644 100644 507919c... dff7a5e... M gschem/src/x_dialog.c
:100644 100644 6ac1eb5... fe0fc71... M gschem/src/x_menus.c
:100644 100644 f57d635... b3200d0... M libgeda/src/libgeda.c
commit eaaa0acc2c5f61c51ba4a7a595c23001446aa4fc
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Fix build.
In commit 7cf7a33ea187, a Makefile.am file was removed, but
configure.ac was not updated to reflect this.
:100644 100644 2a820f5... 69a5c5a... M configure.ac
=========
Changes
=========
commit d8803215ea591b9349999c17c5a85aee7da473af
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Remove warnings when building with "--disable-nls".
Closes-bug: lp-698450
diff --git a/gschem/src/gschem.c b/gschem/src/gschem.c
index fec69c0..f2150a3 100644
--- a/gschem/src/gschem.c
+++ b/gschem/src/gschem.c
@@ -214,9 +214,10 @@ void main_prog(void *closure, int argc, char *argv[])
o_undo_init();
if (s_path_sys_data () == NULL) {
- gchar *message = _("You must set the GEDADATA environment variable!\n\n"
- "gschem cannot locate its data files. You must set the GEDADATA\n"
- "environment variable to point to the correct location.\n");
+ const gchar *message =
+ _("You must set the GEDADATA environment variable!\n\n"
+ "gschem cannot locate its data files. You must set the GEDADATA\n"
+ "environment variable to point to the correct location.\n");
GtkWidget* error_diag =
gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
diff --git a/gschem/src/x_dialog.c b/gschem/src/x_dialog.c
index 507919c..dff7a5e 100644
--- a/gschem/src/x_dialog.c
+++ b/gschem/src/x_dialog.c
@@ -3702,6 +3702,7 @@ close_confirmation_dialog_constructor (GType type,
GtkTreeIter iter;
gboolean ret, single_page;
gchar *tmp, *str;
+ const gchar *cstr;
/* chain up to constructor of parent class */
object =
@@ -3811,7 +3812,7 @@ close_confirmation_dialog_constructor (GType type,
}
/* secondary label */
- str = _("If you don't save, all your changes will be permanently lost.");
+ cstr = _("If you don't save, all your changes will be permanently lost.");
label = GTK_WIDGET (g_object_new (GTK_TYPE_LABEL,
/* GtkMisc */
"xalign", 0.0,
diff --git a/gschem/src/x_menus.c b/gschem/src/x_menus.c
index 6ac1eb5..fe0fc71 100644
--- a/gschem/src/x_menus.c
+++ b/gschem/src/x_menus.c
@@ -231,7 +231,11 @@ get_main_menu(GSCHEM_TOPLEVEL *w_current)
static gchar* gettext_fn(const gchar *path,
gpointer func_data ATTRIBUTE_UNUSED)
{
- return gettext(path);
+ /*! \bug Note that we have to discard the 'const' qualifier here to
+ * avoid build warnings when gettext is disabled. This is required
+ * due to the prototype of the function pointer argument to
+ * gtk_item_factory_set_translate_func() */
+ return (gchar *) gettext(path);
}
GtkWidget *get_main_popup(GSCHEM_TOPLEVEL *w_current)
diff --git a/libgeda/src/libgeda.c b/libgeda/src/libgeda.c
index f57d635..b3200d0 100644
--- a/libgeda/src/libgeda.c
+++ b/libgeda/src/libgeda.c
@@ -46,9 +46,11 @@
*/
void libgeda_init(void)
{
+#ifdef ENABLE_NLS
/* Initialise gettext */
bindtextdomain (LIBGEDA_GETTEXT_DOMAIN, LOCALEDIR);
bind_textdomain_codeset(LIBGEDA_GETTEXT_DOMAIN, "UTF-8");
+#endif
/* Initialise gobject */
g_type_init ();
commit eaaa0acc2c5f61c51ba4a7a595c23001446aa4fc
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Fix build.
In commit 7cf7a33ea187, a Makefile.am file was removed, but
configure.ac was not updated to reflect this.
diff --git a/configure.ac b/configure.ac
index 2a820f5..69a5c5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,7 +249,6 @@ AC_CONFIG_FILES([Makefile
utils/include/Makefile
utils/lib/Makefile
utils/lib/system-gschlasrc
- utils/man/Makefile
utils/scripts/Makefile
utils/src/Makefile
utils/tests/Makefile
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs