[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]
Re: Gnome 2.0
- From: "Arjan J. Molenaar" <arjanmolenaar hetnet nl>
- To: dia-list <dia-list gnome org>
- Subject: Re: Gnome 2.0
- Date: 10 Jan 2002 22:30:22 +0100
On Wed, 2002-01-09 at 08:36, Cyrille Chepelov wrote: > Le mar, jan 08, 2002, à 11:26:54 +0100, Arjan J. Molenaar a écrit: > > Hi, > > > > This diff is enough to make DIA build against GNOME2 libraries... It > > fails to run however, probably due to the same bug described in > > "Struggling with CVS version of dia" (the mails)... If the menu-bug gets > > fixed... well, maybe it works... > > > You forgot to include the diff... Oops... sorry... > Does this break GNOME1.x ? Ehhmmm... Yes I guess they do.. I added AJM tags wherever I changed something... Regards, Arjan
? diff
? Arjan
? stamp-h1
? sheets/build-sheets.stamp
Index: configure.in
===================================================================
RCS file: /cvs/gnome/dia/configure.in,v
retrieving revision 1.132
diff -u -r1.132 configure.in
--- configure.in 2001/09/08 15:37:25 1.132
+++ configure.in 2002/01/08 22:21:57
@@ -34,10 +34,15 @@
dnl make that 0.10 as soon as the version number is bumped.
dnl XML_I18N_TOOLS_NEWER_THAN_0_9 || AC_MSG_ERROR(unsatisfied dependency)
-
+echo "Been there"
dnl Checks for libraries.
dnl AM_PATH_GLIB(1.2.9) dnl (for g_critical)
-AM_PATH_GTK(1.2.0)
+dnl AM_PATH_GTK(1.2.0)
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 1.3.11)
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
+
+echo "done that"
dnl XIM support (on by default)
AC_ARG_ENABLE(xim,
@@ -55,6 +60,7 @@
dnl GNOME
dnl
+
AC_MSG_CHECKING([whether GNOME specific code should be used])
AC_ARG_ENABLE(gnome,
[ --enable-gnome enable gnome code],
@@ -68,6 +74,12 @@
GNOME_CFLAGS=""
GNOME_LIBS=""
BONOBO_LIBS=""
+
+have_gnome=false
+have_bonobo=false
+
+if false; then
+
bonobo_msg=no
have_gnome=false
have_bonobo=false
@@ -110,6 +122,9 @@
GNOME_CFLAGS=`gnome-config $hcomponents $components --cflags`
GNOME_LIBS=`gnome-config $components --libs`
fi
+
+fi # false
+
AM_CONDITIONAL(HAVE_GNOME, $have_gnome)
AM_CONDITIONAL(HAVE_GNOME_PRINT,
$have_gnome && test "$enable_gnome_print" = "yes")
@@ -200,16 +215,23 @@
dnl libart_lgpl
dnl
-AM_PATH_LIBART(2.1.0,dnl
- [have_libart=yes
- AC_DEFINE(HAVE_LIBART)],
- [have_libart=no])
+dnl AM_PATH_LIBART(2.1.0,dnl
+dnl [have_libart=yes
+dnl AC_DEFINE(HAVE_LIBART)],
+dnl [have_libart=no])
+PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.3.0, [ have_libart=yes
+ AC_DEFINE(HAVE_LIBART)], [have_libart=no])
+AC_SUBST(LIBART_LIBS)
+AC_SUBST(LIBART_CFLAGS)
dnl
dnl gdk_pixbuf
dnl
-AM_PATH_GDK_PIXBUF(0.7.0,,AC_MSG_ERROR([gdk-pixbuf >= 0.7.0 is required]))
+dnl AM_PATH_GDK_PIXBUF(0.7.0,,AC_MSG_ERROR([gdk-pixbuf >= 0.7.0 is required]))
+PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 0.7.0)
+AC_SUBST(GDK_PIXBUF_CFLAGS)
+AC_SUBST(GDK_PIXBUF_LIBS)
dnl
dnl libpng
@@ -267,56 +289,7 @@
dnl
dnl Locate the gnome-xml library
dnl
-
-found_libxml=false
-AC_CHECK_PROG(XML_CONFIG, xml-config, xml-config)
-if test "x$XML_CONFIG" != x ; then
- AC_MSG_CHECKING(for libxml >= 1.8.14)
- vers=`$XML_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN {FS=".";} { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-
- dnl 1.18.14 is required for xmlUseNewParser()
- if test "$vers" -ge 1008014; then
- AC_MSG_RESULT(found)
- found_libxml=true
- XML_LIBS="`$XML_CONFIG --libs`"
- XML_CFLAGS="`$XML_CONFIG --cflags`"
- else
- AC_MSG_RESULT(not found)
- fi
-fi
-
-if ! $found_libxml; then
- AC_CHECK_PROG(XML2_CONFIG, xml2-config, xml2-config)
- if test "x$XML2_CONFIG" != x ; then
- AC_MSG_CHECKING(for libxml >= 2.3.9)
- vers=`$XML2_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN {FS=".";} { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-
- if test "$vers" -ge 2003009; then
- AC_MSG_RESULT(found)
- found_libxml=true
- XML_LIBS="`$XML2_CONFIG --libs`"
- XML_CFLAGS="`$XML2_CONFIG --cflags`"
-
- if test "$enable_gnome_print" = "yes"
- then
- gnome-config --cflags print | \
- grep gnome-xml 2>&1 >/dev/null && \
- AC_MSG_ERROR(libxml2 found but gnome-print uses libxml1 ; this is a conflict.\nPlease do either provide libxml1 or disable gnome-print.)
- fi
- echo $GNOME_CFLAGS | \
- grep gnome-xml 2>&1 >/dev/null && \
- AC_MSG_ERROR(libxml2 found but one GNOME component uses libxml1 ; this is a conflict.\nPlease do either provide libxml1 or disable the offending GNOME component.)
-
- else
- AC_MSG_RESULT(not found)
- fi
- fi
-fi
-
-if ! $found_libxml; then
- AC_MSG_ERROR(Neither libxml1 or libxml2 found. You must install one (libxml1, preferably))
-fi
-
+PKG_CHECK_MODULES(XML, libxml-2.0 >= 2.4.0)
AC_SUBST(XML_LIBS)
AC_SUBST(XML_CFLAGS)
Index: xml-i18n-merge.in.kg
===================================================================
RCS file: /cvs/gnome/dia/xml-i18n-merge.in.kg,v
retrieving revision 1.2
diff -u -r1.2 xml-i18n-merge.in.kg
--- xml-i18n-merge.in.kg 2001/08/19 10:53:43 1.2
+++ xml-i18n-merge.in.kg 2002/01/08 22:22:00
@@ -1,4 +1,4 @@
-#!@XML_I18N_TOOLS_PERL@ -w
+#!@INTLTOOL_PERL@ -w
#
# The XML Translation Merge Tool
Index: app/app_procs.c
===================================================================
RCS file: /cvs/gnome/dia/app/app_procs.c,v
retrieving revision 1.73
diff -u -r1.73 app_procs.c
--- app/app_procs.c 2001/11/01 13:58:55 1.73
+++ app/app_procs.c 2002/01/08 22:22:09
@@ -51,7 +51,7 @@
#endif
#endif
-#include <parser.h>
+#include <libxml/parser.h>
#ifdef G_OS_WIN32
#include <direct.h>
@@ -507,13 +507,13 @@
/* Save menu accelerators */
filename = dia_config_filename("menus" G_DIR_SEPARATOR_S "toolbox");
if (filename!=NULL) {
- GtkPatternSpec pattern;
+ GPatternSpec *pattern;
- gtk_pattern_spec_init(&pattern, "*<Toolbox>*");
+ pattern = g_pattern_spec_new("*<Toolbox>*");
- gtk_item_factory_dump_rc (filename, &pattern, TRUE);
+ /*AJM gtk_item_factory_dump_rc (filename, &pattern, TRUE); */
g_free (filename);
- gtk_pattern_spec_free_segs(&pattern);
+ g_pattern_spec_free(pattern);
}
/* Free loads of stuff (toolbox) */
Index: app/commands.c
===================================================================
RCS file: /cvs/gnome/dia/app/commands.c,v
retrieving revision 1.82
diff -u -r1.82 commands.c
--- app/commands.c 2002/01/01 15:30:24 1.82
+++ app/commands.c 2002/01/08 22:22:09
@@ -549,9 +549,11 @@
if (!logo) {
gchar* datadir = dia_get_data_directory("");
+ GError *error = NULL;
g_snprintf(str, sizeof(str), "%s%sdia_logo.png", datadir, G_DIR_SEPARATOR_S);
- logo = gdk_pixbuf_new_from_file(str);
+ logo = gdk_pixbuf_new_from_file(str, &error);
g_free(datadir);
+ g_error_free (error);
}
if (logo) {
Index: app/diaconv.c
===================================================================
RCS file: /cvs/gnome/dia/app/diaconv.c,v
retrieving revision 1.3
diff -u -r1.3 diaconv.c
--- app/diaconv.c 2001/09/02 21:17:01 1.3
+++ app/diaconv.c 2002/01/08 22:22:10
@@ -38,7 +38,7 @@
#endif
#include <gmodule.h>
-#include <parser.h>
+#include <libxml/parser.h>
#ifdef G_OS_WIN32
#include <direct.h>
Index: app/diagram.c
===================================================================
RCS file: /cvs/gnome/dia/app/diagram.c,v
retrieving revision 1.48
diff -u -r1.48 diagram.c
--- app/diagram.c 2002/01/01 15:30:24 1.48
+++ app/diagram.c 2002/01/08 22:22:12
@@ -21,6 +21,7 @@
#include <assert.h>
#include <string.h>
+
#include "intl.h"
#include "diagram.h"
#include "group.h"
@@ -132,13 +133,16 @@
home_path = dia_config_filename("menus" G_DIR_SEPARATOR_S "display");
if (home_path != NULL) {
- GtkPatternSpec pattern;
+ GPatternSpec *pattern;
+
+ pattern = g_pattern_spec_new ("*<Display>*");
+ /*AJM g_pattern_spec_init(&pattern, "*<Display>*"); */
- gtk_pattern_spec_init(&pattern, "*<Display>*");
+ /*AJM TODO: What does GTK-2.0 use to store accelerators?
+ * gtk_item_factory_dump_rc (home_path, pattern, TRUE); */
- gtk_item_factory_dump_rc (home_path, &pattern, TRUE);
g_free (home_path);
- gtk_pattern_spec_free_segs(&pattern);
+ g_pattern_spec_free(pattern);
}
open_diagrams = g_list_remove(open_diagrams, dia);
Index: app/diapagelayout.c
===================================================================
RCS file: /cvs/gnome/dia/app/diapagelayout.c,v
retrieving revision 1.13
diff -u -r1.13 diapagelayout.c
--- app/diapagelayout.c 2001/02/23 14:52:14 1.13
+++ app/diapagelayout.c 2002/01/08 22:22:16
@@ -59,8 +59,8 @@
sizeof(DiaPageLayoutClass),
(GtkClassInitFunc) dia_page_layout_class_init,
(GtkObjectInitFunc) dia_page_layout_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ /*AJM (GtkArgSetFunc) */ NULL,
+ /*AJM (GtkArgGetFunc) */ NULL
};
pl_type = gtk_type_unique(gtk_table_get_type(), &pl_info);
}
@@ -76,13 +76,14 @@
parent_class = gtk_type_class(gtk_table_get_type());
pl_signals[CHANGED] =
- gtk_signal_new("changed",
- GTK_RUN_FIRST,
- object_class->type,
- GTK_SIGNAL_OFFSET(DiaPageLayoutClass, changed),
- gtk_signal_default_marshaller,
- GTK_TYPE_NONE, 0);
- gtk_object_class_add_signals(object_class, pl_signals, LAST_SIGNAL);
+ g_signal_new("changed",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET(DiaPageLayoutClass, changed),
+ NULL, NULL,
+ gtk_signal_default_marshaller,
+ G_TYPE_NONE, 0);
+ //gtk_object_class_add_signals(object_class, pl_signals, LAST_SIGNAL);
object_class->destroy = dia_page_layout_destroy;
}
Index: app/diaunitspinner.c
===================================================================
RCS file: /cvs/gnome/dia/app/diaunitspinner.c,v
retrieving revision 1.7
diff -u -r1.7 diaunitspinner.c
--- app/diaunitspinner.c 2001/03/23 14:29:48 1.7
+++ app/diaunitspinner.c 2002/01/08 22:22:17
@@ -68,8 +68,8 @@
sizeof(DiaUnitSpinnerClass),
(GtkClassInitFunc) dia_unit_spinner_class_init,
(GtkObjectInitFunc) dia_unit_spinner_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ /*AJM (GtkArgSetFunc) */ NULL,
+ /*AJM (GtkArgGetFunc) */ NULL
};
us_type = gtk_type_unique(gtk_spin_button_get_type(), &us_info);
}
@@ -92,7 +92,7 @@
static gint dia_unit_spinner_focus_out(GtkWidget *widget, GdkEventFocus *ev);
static gint dia_unit_spinner_button_press(GtkWidget *widget,GdkEventButton*ev);
static gint dia_unit_spinner_key_press(GtkWidget *widget, GdkEventKey *event);
-static void dia_unit_spinner_activate(GtkEditable *editable);
+static void dia_unit_spinner_changed(GtkEditable *editable);
static void
dia_unit_spinner_class_init(DiaUnitSpinnerClass *class)
@@ -108,7 +108,7 @@
widget_class->focus_out_event = dia_unit_spinner_focus_out;
widget_class->button_press_event = dia_unit_spinner_button_press;
widget_class->key_press_event = dia_unit_spinner_key_press;
- editable_class->activate = dia_unit_spinner_activate;
+ editable_class->changed = dia_unit_spinner_changed;
parent_class = gtk_type_class(GTK_TYPE_SPIN_BUTTON);
entry_class = gtk_type_class(GTK_TYPE_ENTRY);
@@ -205,7 +205,7 @@
static gint
dia_unit_spinner_focus_out(GtkWidget *widget, GdkEventFocus *event)
{
- if (GTK_EDITABLE(widget)->editable)
+ if (gtk_editable_get_editable (GTK_EDITABLE(widget)))
dia_unit_spinner_update(DIA_UNIT_SPINNER(widget));
return GTK_WIDGET_CLASS(entry_class)->focus_out_event(widget, event);
}
@@ -222,7 +222,7 @@
{
gint key = event->keyval;
- if (GTK_EDITABLE (widget)->editable &&
+ if (gtk_editable_get_editable (GTK_EDITABLE (widget)) &&
(key == GDK_Up || key == GDK_Down ||
key == GDK_Page_Up || key == GDK_Page_Down))
dia_unit_spinner_update (DIA_UNIT_SPINNER(widget));
@@ -230,9 +230,9 @@
}
static void
-dia_unit_spinner_activate(GtkEditable *editable)
+dia_unit_spinner_changed(GtkEditable *editable)
{
- if (editable->editable)
+ if (gtk_editable_get_editable (editable))
dia_unit_spinner_update(DIA_UNIT_SPINNER(editable));
}
Index: app/disp_callbacks.c
===================================================================
RCS file: /cvs/gnome/dia/app/disp_callbacks.c,v
retrieving revision 1.42
diff -u -r1.42 disp_callbacks.c
--- app/disp_callbacks.c 2001/08/18 15:49:49 1.42
+++ app/disp_callbacks.c 2002/01/08 22:22:20
@@ -96,7 +96,7 @@
GtkWidget *menu_item;
menu = gtk_menu_new();
- gtk_menu_ensure_uline_accel_group (GTK_MENU (menu)) ;
+ /*AJM removed in 2.0 gtk_menu_ensure_uline_accel_group (GTK_MENU (menu)) ; */
if ( dia_menu->title ) {
menu_item = gtk_menu_item_new_with_label(gettext(dia_menu->title));
@@ -216,12 +216,14 @@
ddisp = (DDisplay *)data;
GTK_WIDGET_SET_FLAGS(widget, GTK_HAS_FOCUS);
- gtk_widget_draw_focus(widget);
+ /*AJM: removed in 2.0 gtk_widget_draw_focus(widget); */
#ifdef USE_XIM
+#ifdef OLD_IC_CODE
if (gdk_im_ready () && ddisp->ic)
gdk_im_begin(ddisp->ic, widget->window);
#endif
+#endif
return FALSE;
}
@@ -241,11 +243,13 @@
ddisp = (DDisplay *)data;
GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
- gtk_widget_draw_focus (widget);
+ /*AJM gtk_widget_draw_focus (widget); */
#ifdef USE_XIM
+#ifdef OLD_IC_CODE
gdk_im_end ();
#endif
+#endif
return return_val;
}
@@ -261,6 +265,7 @@
ddisp = (DDisplay *)data;
#ifdef USE_XIM
+#ifdef OLD_IC_CODE
if (gdk_im_ready() && (ddisp->ic_attr = gdk_ic_attr_new()) != NULL) {
gint width, height;
GdkColormap *colormap;
@@ -320,6 +325,7 @@
}
}
#endif
+#endif
}
void
@@ -333,6 +339,7 @@
ddisp = (DDisplay *) data;
#ifdef USE_XIM
+#ifdef OLD_IC_CODE
if (gdk_im_ready ()) {
if (ddisp->ic)
gdk_ic_destroy (ddisp->ic);
@@ -342,10 +349,12 @@
ddisp->ic_attr = NULL;
}
#endif
+#endif
}
#ifdef USE_XIM
+#ifdef OLD_IC_CODE
static void
set_input_dialog(DDisplay *ddisp, int x, int y)
{
@@ -356,6 +365,7 @@
}
}
#endif
+#endif
void
ddisplay_popup_menu(DDisplay *ddisp, GdkEventButton *event)
@@ -568,9 +578,11 @@
object_add_updates(obj, ddisp->diagram);
#ifdef USE_XIM
+#ifdef OLD_IC_CODE
ddisplay_transform_coords(ddisp, obj->position.x, obj->position.y,
&x, &y);
set_input_dialog(ddisp, x, y);
+#endif
#endif
modified = (focus->key_event)(focus, kevent->keyval,
kevent->string, kevent->length,
Index: app/display.h
===================================================================
RCS file: /cvs/gnome/dia/app/display.h,v
retrieving revision 1.19
diff -u -r1.19 display.h
--- app/display.h 2001/08/16 12:18:19 1.19
+++ app/display.h 2002/01/08 22:22:20
@@ -81,8 +81,8 @@
guint update_id; /* idle handler ID for redraws */
/* input contexts */
- GdkIC *ic;
- GdkICAttr *ic_attr;
+ /* AJM GdkIC *ic;
+ GdkICAttr *ic_attr; */
};
extern GdkCursor *default_cursor;
Index: app/filedlg.c
===================================================================
RCS file: /cvs/gnome/dia/app/filedlg.c,v
retrieving revision 1.16
diff -u -r1.16 filedlg.c
--- app/filedlg.c 2001/03/23 14:29:48 1.16
+++ app/filedlg.c 2002/01/08 22:22:23
@@ -70,7 +70,7 @@
{
DiaImportFilter *ifilter = gtk_object_get_user_data(item);
GString *s;
- gchar *text = gtk_entry_get_text(GTK_ENTRY(GTK_FILE_SELECTION(opendlg)
+ gchar *text = (char*)gtk_entry_get_text(GTK_ENTRY(GTK_FILE_SELECTION(opendlg)
->selection_entry));
gchar *last_dot = strrchr(text, '.');
Index: app/gtkwrapbox.c
===================================================================
RCS file: /cvs/gnome/dia/app/gtkwrapbox.c,v
retrieving revision 1.2
diff -u -r1.2 gtkwrapbox.c
--- app/gtkwrapbox.c 2001/03/23 14:29:48 1.2
+++ app/gtkwrapbox.c 2002/01/08 22:22:25
@@ -25,6 +25,9 @@
#include "gtkwrapbox.h"
+#ifndef _
+# define _(s) s
+#endif
/* --- arguments --- */
enum {
@@ -58,14 +61,16 @@
static void gtk_wrap_box_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
-static void gtk_wrap_box_set_child_arg (GtkContainer *container,
+static void gtk_wrap_box_set_child_property (GtkContainer *container,
GtkWidget *child,
- GtkArg *arg,
- guint arg_id);
-static void gtk_wrap_box_get_child_arg (GtkContainer *container,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_wrap_box_get_child_property (GtkContainer *container,
GtkWidget *child,
- GtkArg *arg,
- guint arg_id);
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec);
static void gtk_wrap_box_map (GtkWidget *widget);
static void gtk_wrap_box_unmap (GtkWidget *widget);
static void gtk_wrap_box_draw (GtkWidget *widget,
@@ -131,15 +136,15 @@
widget_class->map = gtk_wrap_box_map;
widget_class->unmap = gtk_wrap_box_unmap;
- widget_class->draw = gtk_wrap_box_draw;
+ /*AJM widget_class->draw = gtk_wrap_box_draw; */
widget_class->expose_event = gtk_wrap_box_expose;
container_class->add = gtk_wrap_box_add;
container_class->remove = gtk_wrap_box_remove;
container_class->forall = gtk_wrap_box_forall;
container_class->child_type = gtk_wrap_box_child_type;
- container_class->set_child_arg = gtk_wrap_box_set_child_arg;
- container_class->get_child_arg = gtk_wrap_box_get_child_arg;
+ container_class->set_child_property = gtk_wrap_box_set_child_property;
+ container_class->get_child_property = gtk_wrap_box_get_child_property;
class->rlist_line_children = NULL;
@@ -159,18 +164,55 @@
GTK_TYPE_FLOAT, GTK_ARG_READABLE, ARG_CURRENT_RATIO);
gtk_object_add_arg_type ("GtkWrapBox::max_children_per_line",
GTK_TYPE_UINT, GTK_ARG_READWRITE, ARG_CHILD_LIMIT);
- gtk_container_add_child_arg_type ("GtkWrapBox::position",
- GTK_TYPE_INT, GTK_ARG_READWRITE, CHILD_ARG_POSITION);
- gtk_container_add_child_arg_type ("GtkWrapBox::hexpand",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_HEXPAND);
- gtk_container_add_child_arg_type ("GtkWrapBox::hfill",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_HFILL);
- gtk_container_add_child_arg_type ("GtkWrapBox::vexpand",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_VEXPAND);
- gtk_container_add_child_arg_type ("GtkWrapBox::vfill",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_VFILL);
- gtk_container_add_child_arg_type ("GtkWrapBox::forcebreak",
- GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_FORCED_BREAK);
+// gtk_container_add_child_arg_type ("GtkWrapBox::position",
+// GTK_TYPE_INT, GTK_ARG_READWRITE, CHILD_ARG_POSITION);
+ gtk_container_class_install_child_property (container_class,
+ CHILD_ARG_POSITION,
+ g_param_spec_int ("position",
+ _("Position"),
+ _("Position"),
+ G_MININT, G_MAXINT, 0,
+ G_PARAM_READWRITE));
+// gtk_container_add_child_arg_type ("GtkWrapBox::hexpand",
+// GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_HEXPAND);
+ gtk_container_class_install_child_property (container_class, CHILD_ARG_HEXPAND,
+ g_param_spec_boolean ("hexpand",
+ _(""),
+ _(""),
+ FALSE,
+ G_PARAM_READWRITE));
+// gtk_container_add_child_arg_type ("GtkWrapBox::hfill",
+// GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_HFILL);
+ gtk_container_class_install_child_property (container_class, CHILD_ARG_HFILL,
+ g_param_spec_boolean ("hfill",
+ _(""),
+ _(""),
+ FALSE,
+ G_PARAM_READWRITE));
+// gtk_container_add_child_arg_type ("GtkWrapBox::vexpand",
+// GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_VEXPAND);
+ gtk_container_class_install_child_property (container_class, CHILD_ARG_VEXPAND,
+ g_param_spec_boolean ("vexpand",
+ _(""),
+ _(""),
+ FALSE,
+ G_PARAM_READWRITE));
+// gtk_container_add_child_arg_type ("GtkWrapBox::vfill",
+// GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_VFILL);
+ gtk_container_class_install_child_property (container_class, CHILD_ARG_VFILL,
+ g_param_spec_boolean ("vfill",
+ _(""),
+ _(""),
+ FALSE,
+ G_PARAM_READWRITE));
+// gtk_container_add_child_arg_type ("GtkWrapBox::forcebreak",
+// GTK_TYPE_BOOL, GTK_ARG_READWRITE, CHILD_ARG_FORCED_BREAK);
+ gtk_container_class_install_child_property (container_class, CHILD_ARG_FORCED_BREAK,
+ g_param_spec_boolean ("forcebreak",
+ _(""),
+ _(""),
+ FALSE,
+ G_PARAM_READWRITE));
}
static void
@@ -268,45 +310,46 @@
}
static void
-gtk_wrap_box_set_child_arg (GtkContainer *container,
- GtkWidget *child,
- GtkArg *arg,
- guint arg_id)
+gtk_wrap_box_set_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GtkWrapBox *wbox = GTK_WRAP_BOX (container);
gboolean hexpand = FALSE, hfill = FALSE, vexpand = FALSE, vfill = FALSE;
- if (arg_id != CHILD_ARG_POSITION)
+ if (property_id != CHILD_ARG_POSITION)
gtk_wrap_box_query_child_packing (wbox, child, &hexpand, &hfill, &vexpand, &vfill);
- switch (arg_id)
+ switch (property_id)
{
case CHILD_ARG_POSITION:
- gtk_wrap_box_reorder_child (wbox, child, GTK_VALUE_INT (*arg));
+ gtk_wrap_box_reorder_child (wbox, child, g_value_get_int (value));
break;
case CHILD_ARG_HEXPAND:
gtk_wrap_box_set_child_packing (wbox, child,
- GTK_VALUE_BOOL (*arg), hfill,
+ g_value_get_boolean (value), hfill,
vexpand, vfill);
break;
case CHILD_ARG_HFILL:
gtk_wrap_box_set_child_packing (wbox, child,
- hexpand, GTK_VALUE_BOOL (*arg),
+ hexpand, g_value_get_boolean (value),
vexpand, vfill);
break;
case CHILD_ARG_VEXPAND:
gtk_wrap_box_set_child_packing (wbox, child,
hexpand, hfill,
- GTK_VALUE_BOOL (*arg), vfill);
+ g_value_get_boolean (value), vfill);
break;
case CHILD_ARG_VFILL:
gtk_wrap_box_set_child_packing (wbox, child,
hexpand, hfill,
- vexpand, GTK_VALUE_BOOL (*arg));
+ vexpand, g_value_get_boolean (value));
break;
case CHILD_ARG_FORCED_BREAK:
gtk_wrap_box_set_child_forced_break (wbox, child,
- GTK_VALUE_BOOL (*arg));
+ g_value_get_boolean (value));
break;
default:
break;
@@ -314,45 +357,54 @@
}
static void
-gtk_wrap_box_get_child_arg (GtkContainer *container,
- GtkWidget *child,
- GtkArg *arg,
- guint arg_id)
+gtk_wrap_box_get_child_property (GtkContainer *container,
+ GtkWidget *child,
+ guint property_id,
+ GValue *value,
+ GParamSpec *pspec)
{
GtkWrapBox *wbox = GTK_WRAP_BOX (container);
gboolean hexpand = FALSE, hfill = FALSE, vexpand = FALSE, vfill = FALSE;
-
- if (arg_id != CHILD_ARG_POSITION)
+ int v;
+
+ if (property_id != CHILD_ARG_POSITION)
gtk_wrap_box_query_child_packing (wbox, child, &hexpand, &hfill, &vexpand, &vfill);
- switch (arg_id)
+ switch (property_id)
{
GtkWrapBoxChild *child_info;
case CHILD_ARG_POSITION:
- GTK_VALUE_INT (*arg) = 0;
+ v = 0;
for (child_info = wbox->children; child_info; child_info = child_info->next)
{
if (child_info->widget == child)
break;
- GTK_VALUE_INT (*arg)++;
+ v++;
}
if (!child_info)
- GTK_VALUE_INT (*arg) = -1;
+ g_value_set_int (value, -1);
+ else
+ g_value_set_int (value, v);
break;
case CHILD_ARG_HEXPAND:
- GTK_VALUE_BOOL (*arg) = hexpand;
+ //GTK_VALUE_BOOL (*arg) = hexpand;
+ g_value_set_boolean (value, hexpand);
break;
case CHILD_ARG_HFILL:
- GTK_VALUE_BOOL (*arg) = hfill;
+ //GTK_VALUE_BOOL (*arg) = hfill;
+ g_value_set_boolean (value, hfill);
break;
case CHILD_ARG_VEXPAND:
- GTK_VALUE_BOOL (*arg) = vexpand;
+ //GTK_VALUE_BOOL (*arg) = vexpand;
+ g_value_set_boolean (value, vexpand);
break;
case CHILD_ARG_VFILL:
- GTK_VALUE_BOOL (*arg) = vfill;
+ //GTK_VALUE_BOOL (*arg) = vfill;
+ g_value_set_boolean (value, vfill);
break;
default:
- arg->type = GTK_TYPE_INVALID;
+ //arg->type = GTK_TYPE_INVALID;
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (child, property_id, pspec);
break;
}
}
Index: app/gtkwrapbox.h
===================================================================
RCS file: /cvs/gnome/dia/app/gtkwrapbox.h,v
retrieving revision 1.1
diff -u -r1.1 gtkwrapbox.h
--- app/gtkwrapbox.h 2000/02/20 04:28:15 1.1
+++ app/gtkwrapbox.h 2002/01/08 22:22:26
@@ -38,7 +38,7 @@
#define GTK_WRAP_BOX_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_WRAP_BOX, GtkWrapBoxClass))
#define GTK_IS_WRAP_BOX(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_WRAP_BOX))
#define GTK_IS_WRAP_BOX_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WRAP_BOX))
-#define GTK_WRAP_BOX_GET_CLASS(obj) (GTK_WRAP_BOX_CLASS (((GtkObject*) (obj))->klass))
+#define GTK_WRAP_BOX_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WRAP_BOX, GtkWrapBoxClass))
/* --- typedefs --- */
Index: app/interface.c
===================================================================
RCS file: /cvs/gnome/dia/app/interface.c,v
retrieving revision 1.60
diff -u -r1.60 interface.c
--- app/interface.c 2001/11/20 22:24:14 1.60
+++ app/interface.c 2002/01/08 22:22:34
@@ -339,12 +339,12 @@
ddisp->hrule = gtk_hruler_new ();
gtk_signal_connect_object (GTK_OBJECT (ddisp->shell), "motion_notify_event",
- (GtkSignalFunc) GTK_WIDGET_CLASS (GTK_OBJECT (ddisp->hrule)->klass)->motion_notify_event,
+ (GtkSignalFunc) GTK_WIDGET_GET_CLASS (GTK_OBJECT (ddisp->hrule))->motion_notify_event,
GTK_OBJECT (ddisp->hrule));
ddisp->vrule = gtk_vruler_new ();
gtk_signal_connect_object (GTK_OBJECT (ddisp->shell), "motion_notify_event",
- (GtkSignalFunc) GTK_WIDGET_CLASS (GTK_OBJECT (ddisp->vrule)->klass)->motion_notify_event,
+ (GtkSignalFunc) GTK_WIDGET_GET_CLASS (GTK_OBJECT (ddisp->vrule))->motion_notify_event,
GTK_OBJECT (ddisp->vrule));
ddisp->hsb = gtk_hscrollbar_new (ddisp->hsbdata);
@@ -763,6 +763,7 @@
GtkWidget *pixmapwidget;
GtkWidget *button;
ToolButtonData *data;
+ GError *error = NULL;
if (sheet_obj->pixmap != NULL) {
pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL,
@@ -771,7 +772,8 @@
} else if (sheet_obj->pixmap_file != NULL) {
GdkPixbuf *pixbuf;
- pixbuf = gdk_pixbuf_new_from_file(sheet_obj->pixmap_file);
+ pixbuf = gdk_pixbuf_new_from_file(sheet_obj->pixmap_file, &error);
+ g_error_free (error);
if (pixbuf != NULL) {
gdk_pixbuf_render_pixmap_and_mask(pixbuf, &pixmap, &mask, 1.0);
gdk_pixbuf_unref(pixbuf);
@@ -1149,7 +1151,7 @@
/* menus -- initialised afterwards, because initing the display menus
* uses the tool buttons*/
menus_get_toolbox_menubar(&menubar, &accel_group);
- gtk_accel_group_attach (accel_group, GTK_OBJECT (window));
+ _gtk_accel_group_attach (accel_group, GTK_OBJECT (window));
#ifdef GNOME
gnome_app_set_menus(GNOME_APP(window), GTK_MENU_BAR(menubar));
#else
Index: app/layer_dialog.c
===================================================================
RCS file: /cvs/gnome/dia/app/layer_dialog.c,v
retrieving revision 1.14
diff -u -r1.14 layer_dialog.c
--- app/layer_dialog.c 2001/02/23 14:52:14 1.14
+++ app/layer_dialog.c 2002/01/08 22:22:36
@@ -847,8 +847,8 @@
sizeof (DiaLayerWidgetClass),
(GtkClassInitFunc) dia_layer_widget_class_init,
(GtkObjectInitFunc) dia_layer_widget_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ /*AJM (GtkArgSetFunc) */ NULL,
+ /*AJM (GtkArgGetFunc) */ NULL
};
dlw_type = gtk_type_unique (gtk_list_item_get_type (), &dlw_info);
Index: app/load_save.c
===================================================================
RCS file: /cvs/gnome/dia/app/load_save.c,v
retrieving revision 1.44
diff -u -r1.44 load_save.c
--- app/load_save.c 2001/09/07 15:28:29 1.44
+++ app/load_save.c 2002/01/08 22:22:39
@@ -30,9 +30,9 @@
#include "intl.h"
-#include <tree.h>
-#include <parser.h>
-#include <xmlmemory.h>
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
#include "dia_xml_libxml.h"
#include "dia_xml.h"
Index: app/menus.c
===================================================================
RCS file: /cvs/gnome/dia/app/menus.c,v
retrieving revision 1.76
diff -u -r1.76 menus.c
--- app/menus.c 2002/01/04 16:43:34 1.76
+++ app/menus.c 2002/01/08 22:22:44
@@ -579,7 +579,7 @@
accelfilename = dia_config_filename("menurc");
if (accelfilename) {
- gtk_item_factory_dump_rc (accelfilename, NULL, TRUE);
+ /*AJM gtk_item_factory_dump_rc (accelfilename, NULL, TRUE); */
g_free (accelfilename);
}
return TRUE;
@@ -736,7 +736,7 @@
accelfilename = dia_config_filename("menurc");
if (accelfilename) {
- gtk_item_factory_parse_rc(accelfilename);
+ /*AJM gtk_item_factory_parse_rc(accelfilename); */
g_free(accelfilename);
}
gtk_quit_add(1, save_accels, NULL);
Index: app/preferences.c
===================================================================
RCS file: /cvs/gnome/dia/app/preferences.c,v
retrieving revision 1.39
diff -u -r1.39 preferences.c
--- app/preferences.c 2002/01/01 15:30:25 1.39
+++ app/preferences.c 2002/01/08 22:22:48
@@ -452,7 +452,7 @@
fd = open(filename, O_RDONLY);
if (fd < 0) {
- char *homedir = g_get_home_dir();
+ const char *homedir = g_get_home_dir();
g_free(filename);
filename = g_strconcat(homedir, G_DIR_SEPARATOR_S ".diarc", NULL);
@@ -601,7 +601,7 @@
prefs_boolean_toggle(GtkWidget *widget, gpointer data)
{
guint active = GTK_TOGGLE_BUTTON(widget)->active;
- GtkWidget *label = GTK_BUTTON(widget)->child;
+ GtkWidget *label = GTK_BIN(widget)->child;
gtk_label_set(GTK_LABEL(label), active ? _("Yes") : _("No"));
}
Index: app/render_eps.c
===================================================================
RCS file: /cvs/gnome/dia/app/render_eps.c,v
retrieving revision 1.37
diff -u -r1.37 render_eps.c
--- app/render_eps.c 2001/07/18 04:39:06 1.37
+++ app/render_eps.c 2002/01/08 22:22:54
@@ -1458,8 +1458,8 @@
fprintf(renderer->file, "gs\n");
if (1) { /* Color output - experimental */
guchar *rle;
- guchar *ascii;
- int len;
+ /*AJM guchar *ascii; */
+ /*AJM int len; */
fprintf(renderer->file, "/pix %i string def\n", img_width * 3);
fprintf(renderer->file, "%i %i 8\n", img_width, img_height);
Index: app/render_gdk.c
===================================================================
RCS file: /cvs/gnome/dia/app/render_gdk.c,v
retrieving revision 1.20
diff -u -r1.20 render_gdk.c
--- app/render_gdk.c 2001/09/15 12:18:35 1.20
+++ app/render_gdk.c 2002/01/08 22:22:59
@@ -1049,7 +1049,7 @@
old_reg = renderer->clip_region;
- renderer->clip_region =
+ //renderer->clip_region =
gdk_region_union_with_rect( renderer->clip_region, &clip_rect );
gdk_region_destroy(old_reg);
Index: app/splash.c
===================================================================
RCS file: /cvs/gnome/dia/app/splash.c,v
retrieving revision 1.5
diff -u -r1.5 splash.c
--- app/splash.c 2001/03/23 14:29:48 1.5
+++ app/splash.c 2002/01/08 22:22:59
@@ -17,9 +17,11 @@
if (!logo) {
gchar* datadir = dia_get_data_directory("");
+ GError *error = NULL;
g_snprintf(str, sizeof(str), "%s/dia_logo.png", datadir);
- logo = gdk_pixbuf_new_from_file(str);
+ logo = gdk_pixbuf_new_from_file(str, &error);
g_free(datadir);
+ g_error_free (error);
}
if (logo) {
@@ -53,7 +55,7 @@
gchar str[256];
guint signal_id;
- splash = gtk_window_new (GTK_WINDOW_DIALOG);
+ splash = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_wmclass (GTK_WINDOW (splash), "start_dialog", "Dia");
gtk_window_set_title (GTK_WINDOW (splash), _("Loading ..."));
gtk_window_set_policy (GTK_WINDOW (splash), FALSE, FALSE, FALSE);
Index: lib/color.c
===================================================================
RCS file: /cvs/gnome/dia/lib/color.c,v
retrieving revision 1.4
diff -u -r1.4 color.c
--- lib/color.c 2001/03/23 14:29:49 1.4
+++ lib/color.c 2002/01/08 22:22:59
@@ -23,7 +23,7 @@
#include "color.h"
-static GdkColorContext *color_context = NULL;
+/*AJM static GdkColorContext *color_context = NULL; */
Color color_black = { 0.0f, 0.0f, 0.0f };
Color color_white = { 1.0f, 1.0f, 1.0f };
GdkColor color_gdk_black, color_gdk_white;
@@ -31,9 +31,9 @@
void
color_init(void)
{
- GdkVisual *visual = gtk_widget_get_default_visual();
+ /*AJM GdkVisual *visual = gtk_widget_get_default_visual();
GdkColormap *colormap = gtk_widget_get_default_colormap();
- color_context = gdk_color_context_new(visual, colormap);
+ color_context = gdk_color_context_new(visual, colormap); */
color_convert(&color_black, &color_gdk_black);
color_convert(&color_white, &color_gdk_white);
@@ -42,19 +42,21 @@
void
color_convert(Color *color, GdkColor *gdkcolor)
{
- int failed;
-
+ /*AJM int failed; */
+ GdkColormap *colormap = gtk_widget_get_default_colormap ();
+
gdkcolor->red = color->red*65535;
gdkcolor->green = color->green*65535;
gdkcolor->blue = color->blue*65535;
+
+ gdk_rgb_find_color (colormap, gdkcolor);
-
- gdkcolor->pixel =
+ /*AJM gdkcolor->pixel =
gdk_color_context_get_pixel(color_context,
gdkcolor->red,
gdkcolor->green,
gdkcolor->blue,
- &failed);
+ &failed); */
}
gboolean
Index: lib/dia_dirs.c
===================================================================
RCS file: /cvs/gnome/dia/lib/dia_dirs.c,v
retrieving revision 1.7
diff -u -r1.7 dia_dirs.c
--- lib/dia_dirs.c 2001/09/13 18:40:15 1.7
+++ lib/dia_dirs.c 2002/01/08 22:23:00
@@ -84,7 +84,7 @@
gchar *
dia_config_filename(const gchar *subfile)
{
- gchar *homedir;
+ const gchar *homedir;
homedir = g_get_home_dir();
if (!homedir) {
Index: lib/dia_image.c
===================================================================
RCS file: /cvs/gnome/dia/lib/dia_image.c,v
retrieving revision 1.12
diff -u -r1.12 dia_image.c
--- lib/dia_image.c 2000/10/07 05:29:53 1.12
+++ lib/dia_image.c 2002/01/08 22:23:00
@@ -69,8 +69,12 @@
{
DiaImage dia_img;
GdkPixbuf *image;
+ GError *error = NULL;
- image = gdk_pixbuf_new_from_file(filename);
+ image = gdk_pixbuf_new_from_file(filename, &error);
+ /*AJM TODO: Handle error (create a dialog box or something) */
+ if (error)
+ g_error_free (error);
if (image == NULL)
return NULL;
Index: lib/dia_xml.c
===================================================================
RCS file: /cvs/gnome/dia/lib/dia_xml.c,v
retrieving revision 1.29
diff -u -r1.29 dia_xml.c
--- lib/dia_xml.c 2002/01/01 15:30:26 1.29
+++ lib/dia_xml.c 2002/01/08 22:23:04
@@ -25,9 +25,9 @@
#include <math.h>
#include <fcntl.h>
-#include <parser.h>
-#include <parserInternals.h>
-#include <xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/parserInternals.h>
+#include <libxml/xmlmemory.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
Index: lib/dia_xml_libxml.h
===================================================================
RCS file: /cvs/gnome/dia/lib/dia_xml_libxml.h,v
retrieving revision 1.2
diff -u -r1.2 dia_xml_libxml.h
--- lib/dia_xml_libxml.h 2001/09/07 15:28:29 1.2
+++ lib/dia_xml_libxml.h 2002/01/08 22:23:04
@@ -21,8 +21,8 @@
#ifndef DIA_XML_LIBXML_H
#define DIA_XML_LIBXML_H
-#include <tree.h>
-#include <parser.h>
+#include <libxml/tree.h>
+#include <libxml/parser.h>
#include "dia_xml.h"
/* for potentially broken files */
Index: lib/paper.c
===================================================================
RCS file: /cvs/gnome/dia/lib/paper.c,v
retrieving revision 1.5
diff -u -r1.5 paper.c
--- lib/paper.c 2001/04/10 05:01:09 1.5
+++ lib/paper.c 2002/01/08 22:23:05
@@ -76,7 +76,7 @@
{
FILE *papersize;
gchar paper[100];
- gchar *env;
+ const gchar *env;
gint i;
if((env = g_getenv("PAPERCONF")) != NULL) {
Index: lib/plug-ins.c
===================================================================
RCS file: /cvs/gnome/dia/lib/plug-ins.c,v
retrieving revision 1.19
diff -u -r1.19 plug-ins.c
--- lib/plug-ins.c 2001/09/07 15:28:29 1.19
+++ lib/plug-ins.c 2002/01/08 22:23:08
@@ -34,9 +34,9 @@
#include <dirent.h>
#endif
-#include <xmlmemory.h>
-#include <parser.h>
-#include <tree.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
#include "dia_xml_libxml.h"
#include "dia_xml.h"
@@ -415,7 +415,7 @@
void
dia_register_plugins(void)
{
- gchar *library_path;
+ const gchar *library_path;
gchar *lib_dir;
library_path = g_getenv("DIA_LIB_PATH");
Index: lib/prop_attr.c
===================================================================
RCS file: /cvs/gnome/dia/lib/prop_attr.c,v
retrieving revision 1.2
diff -u -r1.2 prop_attr.c
--- lib/prop_attr.c 2001/08/13 18:32:06 1.2
+++ lib/prop_attr.c 2002/01/08 22:23:10
@@ -27,7 +27,7 @@
#endif
#include <gtk/gtk.h>
-#include <tree.h>
+#include <libxml/tree.h>
#include "dia_xml.h"
#include "widgets.h"
#include "properties.h"
Index: lib/prop_attr.h
===================================================================
RCS file: /cvs/gnome/dia/lib/prop_attr.h,v
retrieving revision 1.1
diff -u -r1.1 prop_attr.h
--- lib/prop_attr.h 2001/08/13 07:24:25 1.1
+++ lib/prop_attr.h 2002/01/08 22:23:10
@@ -26,7 +26,7 @@
#define PROP_ATTR_H
#include "properties.h"
-#include "tree.h"
+#include <libxml/tree.h>
#include "dia_xml.h"
typedef struct {
Index: lib/prop_basic.h
===================================================================
RCS file: /cvs/gnome/dia/lib/prop_basic.h,v
retrieving revision 1.1
diff -u -r1.1 prop_basic.h
--- lib/prop_basic.h 2001/08/13 07:24:25 1.1
+++ lib/prop_basic.h 2002/01/08 22:23:10
@@ -27,7 +27,7 @@
#define PROP_BASIC_H
#include "properties.h"
-#include "tree.h"
+#include <libxml/tree.h>
#include "dia_xml.h"
void initialize_property(Property *prop, const PropDescription *pdesc,
Index: lib/prop_geomtypes.h
===================================================================
RCS file: /cvs/gnome/dia/lib/prop_geomtypes.h,v
retrieving revision 1.1
diff -u -r1.1 prop_geomtypes.h
--- lib/prop_geomtypes.h 2001/08/13 07:24:25 1.1
+++ lib/prop_geomtypes.h 2002/01/08 22:23:11
@@ -26,7 +26,7 @@
#define PROP_GEOMTYPES_H
#include "properties.h"
-#include "tree.h"
+#include <libxml/tree.h>
#include "dia_xml.h"
#include "geometry.h"
Index: lib/prop_inttypes.c
===================================================================
RCS file: /cvs/gnome/dia/lib/prop_inttypes.c,v
retrieving revision 1.3
diff -u -r1.3 prop_inttypes.c
--- lib/prop_inttypes.c 2001/08/17 13:55:43 1.3
+++ lib/prop_inttypes.c 2002/01/08 22:23:13
@@ -108,9 +108,9 @@
uni_get_utf8(utfbuf,&uc); g_free(utfbuf);
prop->char_data = uc;
#else
- gchar *buf = gtk_entry_get_text(GTK_ENTRY(widget));
+ const gchar *buf = gtk_entry_get_text(GTK_ENTRY(widget));
prop->char_data = buf[0];
- g_free(buf);
+ /*AJM g_free((gpointer)buf); */
#endif
}
Index: lib/prop_inttypes.h
===================================================================
RCS file: /cvs/gnome/dia/lib/prop_inttypes.h,v
retrieving revision 1.1
diff -u -r1.1 prop_inttypes.h
--- lib/prop_inttypes.h 2001/08/13 07:24:25 1.1
+++ lib/prop_inttypes.h 2002/01/08 22:23:13
@@ -26,7 +26,7 @@
#define PROP_INTTYPES_H
#include "properties.h"
-#include "tree.h"
+#include <libxml/tree.h>
#include "dia_xml.h"
Index: lib/prop_sdarray.h
===================================================================
RCS file: /cvs/gnome/dia/lib/prop_sdarray.h,v
retrieving revision 1.1
diff -u -r1.1 prop_sdarray.h
--- lib/prop_sdarray.h 2001/08/13 07:24:25 1.1
+++ lib/prop_sdarray.h 2002/01/08 22:23:14
@@ -28,7 +28,7 @@
#define PROP_SDARRAY_H
#include "properties.h"
-#include "tree.h"
+#include <libxml/tree.h>
#include "dia_xml.h"
typedef struct {
Index: lib/prop_text.c
===================================================================
RCS file: /cvs/gnome/dia/lib/prop_text.c,v
retrieving revision 1.2
diff -u -r1.2 prop_text.c
--- lib/prop_text.c 2001/08/17 13:55:43 1.2
+++ lib/prop_text.c 2002/01/08 22:23:15
@@ -35,6 +35,10 @@
#include "text.h"
#include "charconv.h"
+/*AJM For the old GtkText widget: */
+#define GTK_ENABLE_BROKEN
+#include <gtk/gtktext.h>
+
/*****************************************************/
/* The STRING, FILE and MULTISTRING property types. */
/*****************************************************/
Index: lib/prop_text.h
===================================================================
RCS file: /cvs/gnome/dia/lib/prop_text.h,v
retrieving revision 1.1
diff -u -r1.1 prop_text.h
--- lib/prop_text.h 2001/08/13 07:24:25 1.1
+++ lib/prop_text.h 2002/01/08 22:23:15
@@ -26,7 +26,7 @@
#define PROP_TEXT_H
#include "properties.h"
-#include "tree.h"
+#include <libxml/tree.h>
#include "dia_xml.h"
#include "text.h"
Index: lib/prop_widgets.h
===================================================================
RCS file: /cvs/gnome/dia/lib/prop_widgets.h,v
retrieving revision 1.1
diff -u -r1.1 prop_widgets.h
--- lib/prop_widgets.h 2001/08/13 07:24:25 1.1
+++ lib/prop_widgets.h 2002/01/08 22:23:15
@@ -26,7 +26,7 @@
#define PROP_WIDGETS_H
#include "properties.h"
-#include "tree.h"
+#include <libxml/tree.h>
#include "dia_xml.h"
#include "text.h"
Index: lib/widgets.c
===================================================================
RCS file: /cvs/gnome/dia/lib/widgets.c,v
retrieving revision 1.26
diff -u -r1.26 widgets.c
--- lib/widgets.c 2001/08/11 02:40:32 1.26
+++ lib/widgets.c 2002/01/08 22:23:19
@@ -24,6 +24,7 @@
#include <glib.h>
#include <gdk/gdk.h>
#include <gtk/gtkradiomenuitem.h>
+#include <gtk/gtkcolorseldialog.h>
#include <gtk/gtklabel.h>
#include <gtk/gtksignal.h>
@@ -112,8 +113,8 @@
sizeof (DiaFontSelectorClass),
(GtkClassInitFunc) dia_font_selector_class_init,
(GtkObjectInitFunc) dia_font_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ /*AJM (GtkArgSetFunc) */ NULL,
+ /*AJM (GtkArgGetFunc) */ NULL
};
dfs_type = gtk_type_unique (gtk_option_menu_get_type (), &dfs_info);
@@ -234,8 +235,8 @@
sizeof (DiaAlignmentSelectorClass),
(GtkClassInitFunc) dia_alignment_selector_class_init,
(GtkObjectInitFunc) dia_alignment_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ /*AJM (GtkArgSetFunc) */ NULL,
+ /*AJM (GtkArgGetFunc) */ NULL
};
dfs_type = gtk_type_unique (gtk_option_menu_get_type (), &dfs_info);
@@ -393,8 +394,8 @@
sizeof (DiaLineStyleSelectorClass),
(GtkClassInitFunc) dia_line_style_selector_class_init,
(GtkObjectInitFunc) dia_line_style_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ /*AJM (GtkArgSetFunc) */ NULL,
+ /*AJM (GtkArgGetFunc) */ NULL
};
dfs_type = gtk_type_unique (gtk_vbox_get_type (), &dfs_info);
@@ -577,8 +578,8 @@
sizeof (DiaColorSelectorClass),
(GtkClassInitFunc) dia_color_selector_class_init,
(GtkObjectInitFunc) dia_color_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ /*AJM (GtkArgSetFunc) */ NULL,
+ /*AJM (GtkArgGetFunc) */ NULL
};
dfs_type = gtk_type_unique (gtk_button_get_type (), &dfs_info);
@@ -755,8 +756,8 @@
sizeof (DiaArrowSelectorClass),
(GtkClassInitFunc) dia_arrow_selector_class_init,
(GtkObjectInitFunc) dia_arrow_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ /*AJM (GtkArgSetFunc) */ NULL,
+ /*AJM (GtkArgGetFunc) */ NULL
};
dfs_type = gtk_type_unique (gtk_vbox_get_type (), &dfs_info);
@@ -901,8 +902,8 @@
sizeof (DiaFileSelectorClass),
(GtkClassInitFunc) dia_file_selector_class_init,
(GtkObjectInitFunc) dia_file_selector_init,
- (GtkArgSetFunc) NULL,
- (GtkArgGetFunc) NULL
+ /*AJM (GtkArgSetFunc) */ NULL,
+ /*AJM (GtkArgGetFunc) */ NULL
};
dfs_type = gtk_type_unique (gtk_hbox_get_type (), &dfs_info);
@@ -929,6 +930,6 @@
dia_file_selector_get_file(DiaFileSelector *fs)
{
/* UTF8 conversions here ? */
- return gtk_entry_get_text(GTK_ENTRY(fs->entry));
+ return (gchar*) gtk_entry_get_text(GTK_ENTRY(fs->entry));
}
Index: lib/widgets.h
===================================================================
RCS file: /cvs/gnome/dia/lib/widgets.h,v
retrieving revision 1.12
diff -u -r1.12 widgets.h
--- lib/widgets.h 2001/07/18 04:39:07 1.12
+++ lib/widgets.h 2002/01/08 22:23:20
@@ -26,6 +26,7 @@
#include <gtk/gtkhbox.h>
#include <gtk/gtkfilesel.h>
#include <gtk/gtkspinbutton.h>
+#include <gtk/gtklabel.h>
#include "font.h"
#include "render.h"
Index: objects/GRAFCET/boolequation.h
===================================================================
RCS file: /cvs/gnome/dia/objects/GRAFCET/boolequation.h,v
retrieving revision 1.6
diff -u -r1.6 boolequation.h
--- objects/GRAFCET/boolequation.h 2001/07/18 04:39:09 1.6
+++ objects/GRAFCET/boolequation.h 2002/01/08 22:23:21
@@ -26,7 +26,7 @@
#define __BOOLEQUATION_H
#include <glib.h>
-#include <tree.h>
+#include <libxml/tree.h>
#include "dia_xml.h"
#include "geometry.h"
#include "render.h"
Index: objects/custom/shape_info.c
===================================================================
RCS file: /cvs/gnome/dia/objects/custom/shape_info.c,v
retrieving revision 1.38
diff -u -r1.38 shape_info.c
--- objects/custom/shape_info.c 2001/08/25 08:48:48 1.38
+++ objects/custom/shape_info.c 2002/01/08 22:23:28
@@ -21,9 +21,9 @@
#include <config.h>
#include <stdlib.h>
-#include <tree.h>
-#include <parser.h>
-#include <xmlmemory.h>
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
#include <float.h>
#include <ctype.h>
#include <string.h>
Index: plug-ins/shape/shape-export.c
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/shape/shape-export.c,v
retrieving revision 1.13
diff -u -r1.13 shape-export.c
--- plug-ins/shape/shape-export.c 2001/09/13 18:40:17 1.13
+++ plug-ins/shape/shape-export.c 2002/01/08 22:23:32
@@ -29,15 +29,15 @@
#include <unistd.h>
#endif
#include <locale.h>
-#include <entities.h>
+#include <libxml/entities.h>
-/* the dots per centimetre to render this diagram at */
+/* the dots per charentimetre to render this diagram at */
/* this matches the setting `100%' setting in dia. */
#define DPCM 20
-#include <tree.h>
-#include <xmlmemory.h>
-#include <parser.h> /* xmlStrdup */
+#include <libxml/tree.h>
+#include <libxml/xmlmemory.h>
+#include <libxml/parser.h> /* xmlStrdup */
#include "dia_xml_libxml.h"
#include "geometry.h"
#include "render.h"
@@ -215,7 +215,7 @@
renderer->doc->xmlRootNode = renderer->root;
dirname = g_dirname(filename);
- sheetname = g_basename(dirname);
+ sheetname = (char*) g_basename(dirname);
shapename = g_strndup(g_basename(filename), strlen(g_basename(filename))-6);
fullname = g_malloc(strlen(sheetname)+3+strlen(shapename)+1);
sprintf(fullname, "%s - %s", sheetname, shapename);
Index: plug-ins/svg/render_svg.c
===================================================================
RCS file: /cvs/gnome/dia/plug-ins/svg/render_svg.c,v
retrieving revision 1.12
diff -u -r1.12 render_svg.c
--- plug-ins/svg/render_svg.c 2001/09/07 15:28:30 1.12
+++ plug-ins/svg/render_svg.c 2002/01/08 22:23:35
@@ -30,10 +30,10 @@
#endif
#include <locale.h>
-#include <entities.h>
+#include <libxml/entities.h>
-#include <tree.h>
-#include <xmlmemory.h>
+#include <libxml/tree.h>
+#include <libxml/xmlmemory.h>
#include "geometry.h"
#include "render.h"
Index: po/ChangeLog
===================================================================
RCS file: /cvs/gnome/dia/po/ChangeLog,v
retrieving revision 1.235
diff -u -r1.235 ChangeLog
--- po/ChangeLog 2002/01/03 03:47:57 1.235
+++ po/ChangeLog 2002/01/08 22:23:39
@@ -1,3 +1,7 @@
+2002-01-05 gettextize <bug-gnu-utils@gnu.org>
+
+ * Makefile.in.in: Upgrade to gettext-0.10.40.
+
2002-01-03 Christian Rose <menthos@menthos.com>
* sv.po: Updated Swedish translation.
- References:
- Dia ChangeLog report for Sat Jan 5 08:23:01 2002 (UTC)
- From: Dia ChangeLog Daemon
- Gnome 2.0
- From: Michael Meeks
- Re: Gnome 2.0
- From: Cyrille Chepelov
- Re: Gnome 2.0
- From: Arjan J. Molenaar
- Re: Gnome 2.0
- From: Cyrille Chepelov
- Re: Gnome 2.0
- From: Arjan J. Molenaar
- Re: Gnome 2.0
- From: Arjan J. Molenaar
- Re: Gnome 2.0
- From: Cyrille Chepelov
- Dia ChangeLog report for Sat Jan 5 08:23:01 2002 (UTC)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index] Mail converted by Mofo Magic and the Flying D
Other Directory Sites: SeekWonder | Directory Owners Forum
GuideSMACK