[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.1.2.20070818-62-ge84c1d4)
The branch, master has been updated
via e84c1d4ba2ad15e18f94346389d2671eb49d0cf5 (commit)
from bdc4d9ce6522fca0bf5332cb9c5228e03861c079 (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
=========
gattrib/src/x_window.c | 4 ++++
gschem/src/gschem_dialog.c | 5 +++++
gschem/src/x_menus.c | 2 +-
libgeda/src/s_clib.c | 1 +
libgeda/src/s_textbuffer.c | 1 +
5 files changed, 12 insertions(+), 1 deletions(-)
=================
Commit Messages
=================
commit e84c1d4ba2ad15e18f94346389d2671eb49d0cf5
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date: Tue Sep 11 22:37:55 2007 -0400
Fixed a whole bunch of gtk+ 2.4.x and misc issues building on an older box
This is a fix for (Patch#) 1789290 libgeda-1.2.0 fprintf which supplied a
similar patch which fixes the issues in libgeda/src/s_clib.c and
libgeda/src/s_textbuffer.c. In the future, all releases will be built with
gtk+ 2.4.x so that these sorts of problems do not get released.
:100644 100644 6540b3d... a710619... M gattrib/src/x_window.c
:100644 100644 dae369a... b4eefd0... M gschem/src/gschem_dialog.c
:100644 100644 5a57fa9... 7256bc6... M gschem/src/x_menus.c
:100644 100644 543dd23... 0ecdaf2... M libgeda/src/s_clib.c
:100644 100644 cb0f309... 5ce865e... M libgeda/src/s_textbuffer.c
=========
Changes
=========
commit e84c1d4ba2ad15e18f94346389d2671eb49d0cf5
Author: Ales Hvezda <ahvezda@xxxxxxxx>
Date: Tue Sep 11 22:37:55 2007 -0400
Fixed a whole bunch of gtk+ 2.4.x and misc issues building on an older box
This is a fix for (Patch#) 1789290 libgeda-1.2.0 fprintf which supplied a
similar patch which fixes the issues in libgeda/src/s_clib.c and
libgeda/src/s_textbuffer.c. In the future, all releases will be built with
gtk+ 2.4.x so that these sorts of problems do not get released.
diff --git a/gattrib/src/x_window.c b/gattrib/src/x_window.c
index 6540b3d..a710619 100644
--- a/gattrib/src/x_window.c
+++ b/gattrib/src/x_window.c
@@ -204,7 +204,11 @@ static const GtkActionEntry actions[] = {
/* Help menu */
{ "help", NULL, "_Help"},
+#if GTK_CHECK_VERSION (2,6,0)
{ "help-about", GTK_STOCK_ABOUT, "About", "", "", x_dialog_about_dialog},
+#else
+ { "help-about", NULL, "About", "", "", x_dialog_about_dialog},
+#endif
};
diff --git a/gschem/src/gschem_dialog.c b/gschem/src/gschem_dialog.c
index dae369a..b4eefd0 100644
--- a/gschem/src/gschem_dialog.c
+++ b/gschem/src/gschem_dialog.c
@@ -19,9 +19,12 @@
*/
#include <config.h>
+#include <glib.h>
+#if GLIB_CHECK_VERSION(2,6,0)
#include <glib-object.h>
#include <glib/gstdio.h>
+#endif
#include <libgeda/libgeda.h>
#include <gtk/gtk.h>
@@ -370,6 +373,7 @@ static void gschem_dialog_class_init (GschemDialogClass *klass)
gschem_dialog_parent_class = g_type_class_peek_parent (klass);
+#if GLIB_CHECK_VERSION(2,6,0)
gschem_dialog_signals[ GEOMETRY_SAVE ] =
g_signal_new ("geometry-save",
G_OBJECT_CLASS_TYPE( gobject_class ),
@@ -397,6 +401,7 @@ static void gschem_dialog_class_init (GschemDialogClass *klass)
G_TYPE_POINTER,
G_TYPE_STRING
);
+#endif
g_object_class_install_property (
gobject_class, PROP_SETTINGS_NAME,
diff --git a/gschem/src/x_menus.c b/gschem/src/x_menus.c
index 5a57fa9..7256bc6 100644
--- a/gschem/src/x_menus.c
+++ b/gschem/src/x_menus.c
@@ -411,7 +411,7 @@ inline void x_menu_attach_recent_files_submenu(TOPLEVEL *w_current)
}
inline void recent_files_load() { }
-inline void recent_files_save() { }
+inline void recent_files_save(gpointer user_data) { }
inline void recent_files_add(const char *filename) { }
#else
diff --git a/libgeda/src/s_clib.c b/libgeda/src/s_clib.c
index 543dd23..0ecdaf2 100644
--- a/libgeda/src/s_clib.c
+++ b/libgeda/src/s_clib.c
@@ -112,6 +112,7 @@
#include <config.h>
+#include <stdio.h>
#include <glib.h>
#ifdef HAVE_STRING_H
diff --git a/libgeda/src/s_textbuffer.c b/libgeda/src/s_textbuffer.c
index cb0f309..5ce865e 100644
--- a/libgeda/src/s_textbuffer.c
+++ b/libgeda/src/s_textbuffer.c
@@ -20,6 +20,7 @@
#include <config.h>
+#include <stdio.h>
#include <glib.h>
#ifdef HAVE_STRING_H
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs