[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-204-g392dd33)
The branch, master has been updated
via 392dd3354812e812f548eadac2c83d8430acd7bf (commit)
from 2b36577f5634ff99e919773c4e34aa2e39dbce51 (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_dialog.c | 2 -
gattrib/src/x_fileselect.c | 4 -
gattrib/src/x_window.c | 34 ---------
gschem/include/gschem_dialog.h | 3 -
gschem/src/gschem_dialog.c | 12 ---
gschem/src/i_callbacks.c | 2 -
gschem/src/o_picture.c | 4 -
gschem/src/x_attribedit.c | 2 -
gschem/src/x_autonumber.c | 2 -
gschem/src/x_compselect.c | 7 --
gschem/src/x_dialog.c | 30 --------
gschem/src/x_fileselect.c | 6 --
gschem/src/x_image.c | 2 -
gschem/src/x_menus.c | 21 ------
gschem/src/x_pagesel.c | 2 -
gschem/src/x_print.c | 4 -
gschem/src/x_script.c | 2 -
gschem/src/x_window.c | 30 --------
utils/src/Makefile.am | 2 -
utils/src/glib12-compat.c | 153 ----------------------------------------
utils/src/gsch2pcb.c | 4 -
21 files changed, 0 insertions(+), 328 deletions(-)
delete mode 100644 utils/src/glib12-compat.c
=================
Commit Messages
=================
commit 392dd3354812e812f548eadac2c83d8430acd7bf
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Mon Sep 29 01:19:39 2008 +0100
Remove conditionally compiled code for GTK/GLIB < 2.6
:100644 100644 b2d52d8... e3f484e... M gattrib/src/x_dialog.c
:100644 100644 555353d... a4d3ad5... M gattrib/src/x_fileselect.c
:100644 100644 3ead80f... 3734326... M gattrib/src/x_window.c
:100644 100644 9e1fdf9... c8696e0... M gschem/include/gschem_dialog.h
:100644 100644 7eab719... 73a54b2... M gschem/src/gschem_dialog.c
:100644 100644 e5f72b8... acc390e... M gschem/src/i_callbacks.c
:100644 100644 66f4240... 37a91bb... M gschem/src/o_picture.c
:100644 100644 8661726... edc65d7... M gschem/src/x_attribedit.c
:100644 100644 d05f394... eb4bc53... M gschem/src/x_autonumber.c
:100644 100644 1217fe2... 1730f52... M gschem/src/x_compselect.c
:100644 100644 2014eaa... bf8c552... M gschem/src/x_dialog.c
:100644 100644 09aa756... c9da033... M gschem/src/x_fileselect.c
:100644 100644 0725485... 3641e7e... M gschem/src/x_image.c
:100644 100644 2dccfcd... 4c80cda... M gschem/src/x_menus.c
:100644 100644 2107747... 372a386... M gschem/src/x_pagesel.c
:100644 100644 36888d4... 38310ea... M gschem/src/x_print.c
:100644 100644 38c1de4... a1a4bd2... M gschem/src/x_script.c
:100644 100644 8d3a224... 6d4904c... M gschem/src/x_window.c
:100644 100644 dabeef6... 1f8d730... M utils/src/Makefile.am
:100644 000000 03e7154... 0000000... D utils/src/glib12-compat.c
:100644 100644 3b7df7d... 8315b5a... M utils/src/gsch2pcb.c
=========
Changes
=========
commit 392dd3354812e812f548eadac2c83d8430acd7bf
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Mon Sep 29 01:19:39 2008 +0100
Remove conditionally compiled code for GTK/GLIB < 2.6
diff --git a/gattrib/src/x_dialog.c b/gattrib/src/x_dialog.c
index b2d52d8..e3f484e 100644
--- a/gattrib/src/x_dialog.c
+++ b/gattrib/src/x_dialog.c
@@ -227,14 +227,12 @@ void x_dialog_unsaved_data()
GTK_STOCK_SAVE, GTK_RESPONSE_YES,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_YES,
GTK_RESPONSE_NO,
GTK_RESPONSE_CANCEL,
-1);
-#endif
switch (gtk_dialog_run (GTK_DIALOG (dialog)))
{
diff --git a/gattrib/src/x_fileselect.c b/gattrib/src/x_fileselect.c
index 555353d..a4d3ad5 100644
--- a/gattrib/src/x_fileselect.c
+++ b/gattrib/src/x_fileselect.c
@@ -237,13 +237,11 @@ x_fileselect_open (void)
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
-#endif
g_object_set (dialog,
/* GtkFileChooser */
@@ -282,13 +280,11 @@ x_fileselect_save (void)
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
-#endif
g_object_set (dialog,
/* GtkFileChooser */
diff --git a/gattrib/src/x_window.c b/gattrib/src/x_window.c
index 3ead80f..3734326 100644
--- a/gattrib/src/x_window.c
+++ b/gattrib/src/x_window.c
@@ -58,7 +58,6 @@
* Gattrib specific defines
*------------------------------------------------------------------*/
#define GATTRIB_THEME_ICON_NAME "geda-gattrib"
-#define GATTRIB_ICON_SIZES 16, 22, 48
static void
x_window_create_menu(GtkWindow *window, GtkWidget **menubar);
@@ -216,11 +215,7 @@ 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
};
@@ -402,39 +397,10 @@ x_window_add_items()
* \par Function Description
* Sets the default window icon by name, to be found in the current icon
* theme. The name used is #defined above as GATTRIB_THEME_ICON_NAME.
- *
- * For GTK versions < 2.6, we have to load the icons explicitly, and pass
- * them to GTK. As we don't know what size is appropriate, a #define above,
- * GATTRIB_ICON_SIZES is used to list (comma separated) the sizes we have
- * icons for. Icons loaded at all of these sizes are passed to GTK.
*/
static void
x_window_set_default_icon( void )
{
-#if GTK_CHECK_VERSION (2,6,0)
gtk_window_set_default_icon_name( GATTRIB_THEME_ICON_NAME );
-#else
- GtkIconTheme *icon_theme;
- GdkPixbuf *icon;
- GList *icon_list = NULL;
- int icon_size[] = { GATTRIB_ICON_SIZES };
- int i;
-
- for ( i = 0; i < sizeof( icon_size ) / sizeof( *icon_size ); i++ ) {
- icon_theme = gtk_icon_theme_get_default();
- icon = gtk_icon_theme_load_icon( icon_theme,
- GATTRIB_THEME_ICON_NAME,
- icon_size[i],
- 0, /* flags */
- NULL /* **error */ );
- if (icon != NULL)
- icon_list = g_list_append( icon_list, icon );
- }
-
- gtk_window_set_default_icon_list( icon_list );
-
- g_list_foreach( icon_list, (GFunc) g_object_unref, NULL );
- g_list_free( icon_list );
-#endif
}
diff --git a/gschem/include/gschem_dialog.h b/gschem/include/gschem_dialog.h
index 9e1fdf9..c8696e0 100644
--- a/gschem/include/gschem_dialog.h
+++ b/gschem/include/gschem_dialog.h
@@ -35,15 +35,12 @@ typedef struct _GschemDialog GschemDialog;
struct _GschemDialogClass {
GtkDialogClass parent_class;
-#if GLIB_CHECK_VERSION(2,6,0)
void (*geometry_save) (GschemDialog *dialog,
GKeyFile *key_file,
gchar *group_name);
void (*geometry_restore) (GschemDialog *dialog,
GKeyFile *key_file,
gchar *group_name);
-#endif
-
};
struct _GschemDialog {
diff --git a/gschem/src/gschem_dialog.c b/gschem/src/gschem_dialog.c
index 7eab719..73a54b2 100644
--- a/gschem/src/gschem_dialog.c
+++ b/gschem/src/gschem_dialog.c
@@ -21,10 +21,8 @@
#include <config.h>
#include <glib.h>
-#if GLIB_CHECK_VERSION(2,6,0)
#include <glib-object.h>
#include <glib/gstdio.h>
-#endif
#include "gschem.h"
#include <gdk/gdkkeysyms.h>
@@ -87,9 +85,6 @@ enum {
static guint gschem_dialog_signals[ LAST_SIGNAL ] = { 0 };
static GObjectClass *gschem_dialog_parent_class = NULL;
-
-#if GLIB_CHECK_VERSION(2,6,0)
-
static GKeyFile *dialog_geometry = NULL;
#define DIALOG_GEOMETRY_STORE "gschem-dialog-geometry"
@@ -259,8 +254,6 @@ static void unmap_handler (GtkWidget *widget)
GTK_WIDGET_CLASS (gschem_dialog_parent_class)->unmap (widget);
}
-#endif /* !GLIB_CHECK_VERSION(2,6,0) */
-
/*! \brief GObject finalise handler
*
@@ -352,8 +345,6 @@ static void gschem_dialog_get_property (GObject *object, guint property_id, GVal
static void gschem_dialog_class_init (GschemDialogClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-#if GLIB_CHECK_VERSION(2,6,0)
GtkWidgetClass *gtkwidget_class = GTK_WIDGET_CLASS (klass);
klass->geometry_save = geometry_save;
@@ -361,7 +352,6 @@ static void gschem_dialog_class_init (GschemDialogClass *klass)
gtkwidget_class->show = show_handler;
gtkwidget_class->unmap = unmap_handler;
-#endif
gobject_class->finalize = gschem_dialog_finalize;
gobject_class->set_property = gschem_dialog_set_property;
@@ -369,7 +359,6 @@ 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,7 +386,6 @@ 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/i_callbacks.c b/gschem/src/i_callbacks.c
index e5f72b8..acc390e 100644
--- a/gschem/src/i_callbacks.c
+++ b/gschem/src/i_callbacks.c
@@ -1788,13 +1788,11 @@ DEFINE_I_CALLBACK(page_revert)
GTK_BUTTONS_YES_NO,
_("Really revert page?"));
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_YES,
GTK_RESPONSE_NO,
-1);
-#endif
response = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index 66f4240..37a91bb 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -139,13 +139,11 @@ void picture_selection_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_STOCK_OPEN,
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->pfswindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
-#endif
if (w_current->pixbuf_filename)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(w_current->pfswindow),
@@ -652,13 +650,11 @@ void picture_change_filename_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->pfswindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
-#endif
if (w_current->pixbuf_filename)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(w_current->pfswindow),
diff --git a/gschem/src/x_attribedit.c b/gschem/src/x_attribedit.c
index 8661726..edc65d7 100644
--- a/gschem/src/x_attribedit.c
+++ b/gschem/src/x_attribedit.c
@@ -336,13 +336,11 @@ void attrib_edit_dialog(GSCHEM_TOPLEVEL *w_current, OBJECT * list, int flag)
GTK_STOCK_OK,
GTK_RESPONSE_APPLY,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(aewindow),
GTK_RESPONSE_APPLY,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_signal_connect(GTK_OBJECT(aewindow), "response",
GTK_SIGNAL_FUNC(attribute_edit_dialog_response), w_current);
diff --git a/gschem/src/x_autonumber.c b/gschem/src/x_autonumber.c
index d05f394..eb4bc53 100644
--- a/gschem/src/x_autonumber.c
+++ b/gschem/src/x_autonumber.c
@@ -1220,13 +1220,11 @@ GtkWidget* autonumber_create_dialog(GSCHEM_TOPLEVEL *w_current)
GTK_STOCK_APPLY,
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(autonumber_text),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position (GTK_WINDOW (autonumber_text),
GTK_WIN_POS_MOUSE);
diff --git a/gschem/src/x_compselect.c b/gschem/src/x_compselect.c
index 1217fe2..1730f52 100644
--- a/gschem/src/x_compselect.c
+++ b/gschem/src/x_compselect.c
@@ -1077,7 +1077,6 @@ compselect_get_type ()
return compselect_type;
}
-#if GLIB_CHECK_VERSION(2,6,0)
/*! \brief GschemDialog "geometry_save" class method handler
*
@@ -1133,19 +1132,15 @@ compselect_geometry_restore (GschemDialog *dialog, GKeyFile *key_file, gchar *gr
gtk_notebook_set_current_page (COMPSELECT (dialog)->viewtabs, position);
}
-#endif /* !GLIB_CHECK_VERSION(2,6,0) */
static void
compselect_class_init (CompselectClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-#if GLIB_CHECK_VERSION(2,6,0)
GschemDialogClass *gschem_dialog_class = GSCHEM_DIALOG_CLASS (klass);
gschem_dialog_class->geometry_save = compselect_geometry_save;
gschem_dialog_class->geometry_restore = compselect_geometry_restore;
-#endif
gobject_class->constructor = compselect_constructor;
gobject_class->finalize = compselect_finalize;
@@ -1288,13 +1283,11 @@ compselect_constructor (GType type,
GTK_STOCK_OK, COMPSELECT_RESPONSE_HIDE,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(compselect),
COMPSELECT_RESPONSE_HIDE,
GTK_RESPONSE_CLOSE,
-1);
-#endif
/* Initialize the hidden property */
compselect->hidden = FALSE;
diff --git a/gschem/src/x_dialog.c b/gschem/src/x_dialog.c
index 2014eaa..bf8c552 100644
--- a/gschem/src/x_dialog.c
+++ b/gschem/src/x_dialog.c
@@ -188,13 +188,11 @@ void text_input_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tiwindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position(GTK_WINDOW (w_current->tiwindow),
GTK_WIN_POS_NONE);
@@ -513,13 +511,11 @@ void text_edit_dialog (GSCHEM_TOPLEVEL *w_current, const char *string, int text_
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tewindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_dialog_set_default_response(GTK_DIALOG(w_current->tewindow),
GTK_RESPONSE_ACCEPT);
@@ -878,13 +874,11 @@ void line_type_dialog (GSCHEM_TOPLEVEL *w_current, GList *objects)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position(GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
@@ -1265,13 +1259,11 @@ void fill_type_dialog(GSCHEM_TOPLEVEL *w_current, GList *objects)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position(GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
@@ -1487,13 +1479,11 @@ void arc_angle_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->aawindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position(GTK_WINDOW(w_current->aawindow),
GTK_WIN_POS_MOUSE);
@@ -1608,13 +1598,11 @@ void translate_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->trwindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position(GTK_WINDOW (w_current->trwindow),
GTK_WIN_POS_MOUSE);
@@ -1708,13 +1696,11 @@ void text_size_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tswindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position(GTK_WINDOW(w_current->tswindow),
GTK_WIN_POS_MOUSE);
@@ -1815,13 +1801,11 @@ void snap_size_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tswindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position(GTK_WINDOW(w_current->tswindow),
GTK_WIN_POS_MOUSE);
@@ -1920,13 +1904,11 @@ void slot_edit_dialog (GSCHEM_TOPLEVEL *w_current, const char *string)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->sewindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position(GTK_WINDOW(w_current->sewindow),
GTK_WIN_POS_MOUSE);
@@ -2408,13 +2390,11 @@ void color_edit_dialog (GSCHEM_TOPLEVEL *w_current)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->clwindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position (GTK_WINDOW (w_current->clwindow),
GTK_WIN_POS_MOUSE);
@@ -2742,13 +2722,11 @@ char *generic_filesel_dialog (const char *msg, const char *templ, gint flags)
NULL);
}
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_OK,
GTK_RESPONSE_CANCEL,
-1);
-#endif
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -2888,13 +2866,11 @@ void find_text_dialog(GSCHEM_TOPLEVEL *w_current)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tfindwindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position(GTK_WINDOW(w_current->tfindwindow),
GTK_WIN_POS_MOUSE);
@@ -2995,13 +2971,11 @@ void hide_text_dialog(GSCHEM_TOPLEVEL * w_current)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->thidewindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position(GTK_WINDOW(w_current->thidewindow),
GTK_WIN_POS_MOUSE);
@@ -3096,13 +3070,11 @@ void show_text_dialog(GSCHEM_TOPLEVEL * w_current)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->tshowwindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
gtk_window_position(GTK_WINDOW(w_current->tshowwindow),
GTK_WIN_POS_MOUSE);
@@ -3730,14 +3702,12 @@ close_confirmation_dialog_constructor (GType type,
GTK_STOCK_SAVE, GTK_RESPONSE_YES,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_YES,
GTK_RESPONSE_NO,
GTK_RESPONSE_CANCEL,
-1);
-#endif
/* all done, let's show the contents of the dialog */
gtk_widget_show_all (hbox);
diff --git a/gschem/src/x_fileselect.c b/gschem/src/x_fileselect.c
index 09aa756..c9da033 100644
--- a/gschem/src/x_fileselect.c
+++ b/gschem/src/x_fileselect.c
@@ -175,13 +175,11 @@ x_fileselect_open(GSCHEM_TOPLEVEL *w_current)
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
-#endif
x_fileselect_add_preview (GTK_FILE_CHOOSER (dialog));
g_object_set (dialog,
@@ -236,13 +234,11 @@ x_fileselect_save (GSCHEM_TOPLEVEL *w_current)
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
-#endif
/* set default response signal. This is usually triggered by the
"Return" key */
@@ -339,13 +335,11 @@ int x_fileselect_load_backup(TOPLEVEL *toplevel, GString *message)
GTK_BUTTONS_YES_NO,
message->str);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_YES,
GTK_RESPONSE_NO,
-1);
-#endif
gtk_widget_show (dialog);
if (gtk_dialog_run ((GtkDialog*)dialog) == GTK_RESPONSE_YES) {
diff --git a/gschem/src/x_image.c b/gschem/src/x_image.c
index 0725485..3641e7e 100644
--- a/gschem/src/x_image.c
+++ b/gschem/src/x_image.c
@@ -500,13 +500,11 @@ void x_image_setup (GSCHEM_TOPLEVEL *w_current)
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
-#endif
/* Add the extra widgets to the dialog*/
gtk_box_pack_start(GTK_BOX(hbox), vbox1, FALSE, FALSE, 10);
diff --git a/gschem/src/x_menus.c b/gschem/src/x_menus.c
index 2dccfcd..4c80cda 100644
--- a/gschem/src/x_menus.c
+++ b/gschem/src/x_menus.c
@@ -26,9 +26,7 @@
#include "gschem.h"
-#if GLIB_CHECK_VERSION(2,6,0)
#include <glib/gstdio.h>
-#endif
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
@@ -391,23 +389,6 @@ out:
}
#endif /* !GLIB_CHECK_VERSION(2,8,0) */
-#if !GLIB_CHECK_VERSION(2,6,0)
-
-/* disable recent files support */
-inline void x_menu_attach_recent_files_submenu(GSCHEM_TOPLEVEL *w_current)
-{
- GtkWidget *recent_menu_item;
-
- recent_menu_item = (GtkWidget *) gtk_object_get_data(GTK_OBJECT(
- w_current->menubar), "File/Recent files");
- gtk_widget_destroy(recent_menu_item);
-}
-
-inline void recent_files_load() { }
-inline void recent_files_save(gpointer user_data) { }
-inline void recent_files_add(const char *filename) { }
-
-#else
/* The list of recently loaded files. */
static GList *recent_files = NULL;
@@ -673,5 +654,3 @@ void recent_files_load()
g_free(file);
g_key_file_free(kf);
}
-
-#endif /* GLIB_MINOR_VERSION < 6 */
diff --git a/gschem/src/x_pagesel.c b/gschem/src/x_pagesel.c
index 2107747..372a386 100644
--- a/gschem/src/x_pagesel.c
+++ b/gschem/src/x_pagesel.c
@@ -479,13 +479,11 @@ static void pagesel_init (Pagesel *pagesel)
GTK_STOCK_CLOSE, PAGESEL_RESPONSE_CLOSE,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(pagesel),
PAGESEL_RESPONSE_UPDATE,
PAGESEL_RESPONSE_CLOSE,
-1);
-#endif
g_signal_connect( pagesel, "notify::gschem-toplevel",
G_CALLBACK( notify_gschem_toplevel_cb ), NULL );
diff --git a/gschem/src/x_print.c b/gschem/src/x_print.c
index 36888d4..38310ea 100644
--- a/gschem/src/x_print.c
+++ b/gschem/src/x_print.c
@@ -89,13 +89,11 @@ print_dialog_action_choosefile (GtkWidget * w, PrintDialog * dialog)
GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT, NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(filechooser),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
-#endif
filename = gtk_entry_get_text (GTK_ENTRY (dialog->fnfield));
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (filechooser), filename);
@@ -392,13 +390,11 @@ print_dialog_init (PrintDialog * dialog)
GTK_STOCK_PRINT, GTK_RESPONSE_ACCEPT);
gtk_widget_grab_focus(print_button);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(dialog),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_REJECT,
-1);
-#endif
/* Set initial radiobutton selection */
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->cmdradio), TRUE);
diff --git a/gschem/src/x_script.c b/gschem/src/x_script.c
index 38c1de4..a1a4bd2 100644
--- a/gschem/src/x_script.c
+++ b/gschem/src/x_script.c
@@ -53,13 +53,11 @@ void setup_script_selector (GSCHEM_TOPLEVEL *w_current)
GTK_RESPONSE_ACCEPT,
NULL);
-#if GTK_CHECK_VERSION (2,6,0)
/* Set the alternative button order (ok, cancel, help) for other systems */
gtk_dialog_set_alternative_button_order(GTK_DIALOG(w_current->sowindow),
GTK_RESPONSE_ACCEPT,
GTK_RESPONSE_CANCEL,
-1);
-#endif
if (gtk_dialog_run (GTK_DIALOG (w_current->sowindow)) == GTK_RESPONSE_ACCEPT) {
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (w_current->sowindow));
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index 8d3a224..6d4904c 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -28,7 +28,6 @@
#endif
#define GSCHEM_THEME_ICON_NAME "geda-gschem"
-#define GSCHEM_ICON_SIZES 16, 22, 48
/*! \todo Finish function documentation!!!
* \brief
@@ -1009,37 +1008,8 @@ x_window_close_page (GSCHEM_TOPLEVEL *w_current, PAGE *page)
* \par Function Description
* Sets the default window icon by name, to be found in the current icon
* theme. The name used is #defined above as GSCHEM_THEME_ICON_NAME.
- *
- * For GTK versions < 2.6, we have to load the icons explicitly, and pass
- * them to GTK. As we don't know what size is appropriate, a #define above,
- * GSCHEM_ICON_SIZES is used to list (comma separated) the sizes we have
- * icons for. Icons loaded at all of these sizes are passed to GTK.
*/
void x_window_set_default_icon( void )
{
-#if GTK_CHECK_VERSION (2,6,0)
gtk_window_set_default_icon_name( GSCHEM_THEME_ICON_NAME );
-#else
- GtkIconTheme *icon_theme;
- GdkPixbuf *icon;
- GList *icon_list = NULL;
- int icon_size[] = { GSCHEM_ICON_SIZES };
- int i;
-
- for ( i = 0; i < sizeof( icon_size ) / sizeof( *icon_size ); i++ ) {
- icon_theme = gtk_icon_theme_get_default();
- icon = gtk_icon_theme_load_icon( icon_theme,
- GSCHEM_THEME_ICON_NAME,
- icon_size[i],
- 0, /* flags */
- NULL /* **error */ );
- if (icon != NULL)
- icon_list = g_list_append( icon_list, icon );
- }
-
- gtk_window_set_default_icon_list( icon_list );
-
- g_list_foreach( icon_list, (GFunc) g_object_unref, NULL );
- g_list_free( icon_list );
-#endif
}
diff --git a/utils/src/Makefile.am b/utils/src/Makefile.am
index dabeef6..1f8d730 100644
--- a/utils/src/Makefile.am
+++ b/utils/src/Makefile.am
@@ -29,8 +29,6 @@ olib_LDADD = -lm
gsch2pcb_LDADD = @GSCH2PCB_LDFLAGS@
grenum_LDADD = @GRENUM_LDFLAGS@
-EXTRA_DIST = glib12-compat.c
-
MOSTLYCLEANFILES = *.log *.ps core FILE *~ olib.c
CLEANFILES = *.log *.ps core FILE *~ olib.c
DISTCLEANFILES = *.log core FILE *~ prototype.bak olib.c
diff --git a/utils/src/glib12-compat.c b/utils/src/glib12-compat.c
deleted file mode 100644
index 03e7154..0000000
--- a/utils/src/glib12-compat.c
+++ /dev/null
@@ -1,153 +0,0 @@
-/* gsch2pcb
-|
-| Bill Wilson billw@xxxxxx
-|
-| This program is free software which I release under the GNU General Public
-| License. You may redistribute and/or modify this program under the terms
-| of that license as published by the Free Software Foundation; either
-| version 2 of the License, or (at your option) any later version.
-|
-| This program is distributed in the hope that it will be useful,
-| but WITHOUT ANY WARRANTY; without even the implied warranty of
-| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-| GNU General Public License for more details. Version 2 is in the
-| COPYRIGHT file in the top level directory of this distribution.
-|
-| To get a copy of the GNU General Puplic License, write to the Free Software
-| Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-
-/* Functions to enable gsch2pcb.c to compile under glib1.2
-*/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-#ifdef HAVE_LIBDMALLOC
-#include <dmalloc.h>
-#endif
-
-typedef struct
- {
- DIR *dir;
- }
- GDir;
-
-GDir *
-g_dir_open(gchar *path, guint flags, gpointer error)
- {
- GDir *gdir;
- DIR *dir;
-
- dir = opendir(path);
- if (!dir)
- return NULL;
- gdir = g_new0(GDir, 1);
- gdir->dir = dir;
- return gdir;
- }
-
-gchar*
-g_dir_read_name(GDir *dir)
- {
- struct dirent *entry;
-
- while ((entry = readdir(dir->dir)) != NULL)
- {
- if ( !strcmp(entry->d_name, ".")
- || !strcmp(entry->d_name, "..")
- )
- continue;
- return entry->d_name;
- }
- return NULL;
- }
-
-void
-g_dir_close(GDir *dir)
- {
- closedir(dir->dir);
- g_free(dir);
- }
-
-
-#define G_FILE_TEST_EXISTS 1
-#define G_FILE_TEST_IS_DIR 2
-#define G_FILE_TEST_IS_REGULAR 4
-
-gboolean
-g_file_test(gchar *filename, gint test)
- {
- struct stat s;
-
- if ((test & G_FILE_TEST_EXISTS) && (access(filename, F_OK) == 0))
- return TRUE;
- if ( (test & G_FILE_TEST_IS_DIR)
- && stat(filename, &s) == 0
- && S_ISDIR(s.st_mode)
- )
- return TRUE;
- if ( (test & G_FILE_TEST_IS_REGULAR)
- && stat(filename, &s) == 0
- && S_ISREG(s.st_mode)
- )
- return TRUE;
-
- return FALSE;
- }
-
-gchar *
-g_build_filename(gchar *first, ...)
- {
- gchar *str;
- va_list args;
- gchar *s, *element, *next_element;
- gboolean is_first = TRUE;
-
- va_start(args, first);
- next_element = first;
- str = g_strdup("");
-
- while (1)
- {
- if (next_element)
- {
- element = next_element;
- next_element = va_arg(args, gchar *);
- }
- else
- break;
- if (is_first)
- {
- is_first = FALSE;
- g_free(str);
- str = g_strdup(element);
- }
- else
- {
- s = str;
- str = g_strconcat(str, G_DIR_SEPARATOR_S, element, NULL);
- g_free(s);
- }
- }
- va_end (args);
-
- return str;
- }
-
-void
-g_spawn_command_line_sync(gchar *command, ...)
- {
- system(command); /* sort of a punt */
- }
-
-gchar *
-g_strrstr(gchar *s, gchar *needle)
- {
- return strstr(s, needle); /* a punt */
- }
diff --git a/utils/src/gsch2pcb.c b/utils/src/gsch2pcb.c
index 3b7df7d..8315b5a 100644
--- a/utils/src/gsch2pcb.c
+++ b/utils/src/gsch2pcb.c
@@ -33,10 +33,6 @@
#include <unistd.h>
#include <sys/stat.h>
-#if !GLIB_CHECK_VERSION(2,0,0)
-#include "glib12-compat.c"
-#endif
-
#ifdef HAVE_LIBDMALLOC
#include <dmalloc.h>
#endif
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs