From 356209d996af24248c20b4cde4e1da0223d813cf Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Fri, 17 Sep 1999 20:11:53 +0000 Subject: [PATCH] 1999-09-17 Federico Mena Quintero * smbfs.c: #define NO_CONFIG_H before including the samba includes; this way it will not re=define HAVE_LIBREADLINE. This situation sucks. Should we change the names of the widget.h history_*() functions? 1999-09-17 Federico Mena Quintero * gmain.c (x_init_dlg): Display a warning if the GtkTed code path is ever reached. (xtoolkit_create_dialog): Likewise. (x_add_widget): Likewise. --- gnome/ChangeLog | 7 +++++++ gnome/Makefile.in | 26 ++++++++++++++++---------- gnome/gmain.c | 5 +++++ gnome/magicdev.idl | 6 ++++++ vfs/ChangeLog | 7 +++++++ vfs/smbfs.c | 1 + 6 files changed, 42 insertions(+), 10 deletions(-) create mode 100644 gnome/magicdev.idl diff --git a/gnome/ChangeLog b/gnome/ChangeLog index f0c61530a..dbafe1a2d 100644 --- a/gnome/ChangeLog +++ b/gnome/ChangeLog @@ -1,3 +1,10 @@ +1999-09-17 Federico Mena Quintero + + * gmain.c (x_init_dlg): Display a warning if the GtkTed code path + is ever reached. + (xtoolkit_create_dialog): Likewise. + (x_add_widget): Likewise. + 1999-09-16 Owen Taylor * gmount.c: Remove the HAVE_MAGICDEV conditional. diff --git a/gnome/Makefile.in b/gnome/Makefile.in index 348b07a46..aff97293b 100644 --- a/gnome/Makefile.in +++ b/gnome/Makefile.in @@ -4,13 +4,13 @@ VPATH = @srcdir@ rootdir = $(srcdir)/.. @MCFG@@MCF@ -GNOMEDEFS = -DHAVE_X -DHAVE_GNOME @GNOME_INCLUDEDIR@ +GNOMEDEFS = -DHAVE_X -DHAVE_GNOME @GNOME_INCLUDEDIR@ CFLAGS = -g $(XCFLAGS) @X_CFLAGS@ -I. -I$(rootdir)/src CPPFLAGS = $(XCPPFLAGS) -I$(vfsdir) $(GNOMEDEFS) LDFLAGS = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEUI_LIBS@ CORBA_LDFLAGS = $(XLDFLAGS) @GNOME_LIBDIR@ @GNOMEGNORBA_LIBS@ DEFS = $(XDEFS) -LIBS = $(XLIBS) @TERMNET@ +LIBS = $(XLIBS) @TERMNET@ EXTRALIBS = -L../vfs @LVFS@ -L../gtkedit -lgtkedit @LINTL@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -215,7 +215,13 @@ $(MAGICDEV_GENERATED): magicdev.idl FileManager-impl.c: FileManager.h -EXTRA_DIST = gnome.TODO layout gmc.gnorba mc.keys.in.in gimp.image.desktop magicdev.idl +EXTRA_DIST = \ + gnome.TODO \ + layout \ + gmc.gnorba \ + mc.keys.in.in \ + gimp.image.desktop \ + magicdev.idl DISTGNOME_NEW = \ gimp.image.desktop application.x-gnumeric.desktop @@ -237,12 +243,12 @@ gmount-corba.o: gmount.c gcorba.o: gcorba.c $(CORBA_GENERATED) gmount.o: gmount.c $(MAGICDEV_GENERATED) -all: @mx@ Makefile mc.keys +all: @mx@ Makefile mc.keys Makefile: Makefile.in ../config.status (cd ..; CONFIG_FILES=gnome/Makefile CONFIG_HEADERS= ./config.status) -mx: checklinks +mx: checklinks $(MAKE) plain-gmc $(MAKE) corba-gmc $(MAKE) gmc-client @@ -255,10 +261,10 @@ mx: checklinks @touch mx plain-gmc: @LIBVFS@ $(OBJS) $(NORMALOBJS) libgtkedit.a - $(CC) -o plain-gmc $(NORMALOBJS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) + $(CC) -o plain-gmc $(NORMALOBJS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) corba-gmc: @LIBVFS@ $(OBJS) $(CORBAOBJS) libgtkedit.a - $(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(EXTRALIBS) $(CORBA_LDFLAGS) $(LIBS) + $(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(EXTRALIBS) $(CORBA_LDFLAGS) $(LIBS) gmc-client: $(CLIENTOBJS) $(CC) -o gmc-client $(CLIENTOBJS) $(CORBA_LDFLAGS) $(LIBS) @@ -267,7 +273,7 @@ mc.keys: mc.keys.in Makefile sed -e 's^\@icondir\@^$(icondir)^g' \ -e 's^\@gnomeicondir\@^$(gnomeicondir)^g' \ < mc.keys.in > mc.keys.tmp \ - && mv mc.keys.tmp mc.keys + && mv mc.keys.tmp mc.keys mc.keys.in: mc.keys.in.in Makefile.in ../config.status (cd ..; CONFIG_FILES=gnome/mc.keys.in CONFIG_HEADERS= ./config.status) @@ -325,7 +331,7 @@ install: install_@mx@ install_: -install_mx: all +install_mx: all $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(MKINSTALLDIRS) $(DESTDIR)$(mclibdir) @@ -341,7 +347,7 @@ install_mx: all $(INSTALL_DATA) mc.keys $(DESTDIR)$(datadir)/mime-info $(INSTALL_DATA) $(srcdir)/gmc.gnorba $(DESTDIR)$(corbadir) -uninstall: +uninstall: -$(RMF) $(DESTDIR)$(bindir)/$(binprefix)gmc -$(RMF) $(DESTDIR)$(bindir)/$(binprefix)corba-gmc for I in $(ICONS); \ diff --git a/gnome/gmain.c b/gnome/gmain.c index b48dc3031..32477bf91 100644 --- a/gnome/gmain.c +++ b/gnome/gmain.c @@ -231,6 +231,7 @@ xtoolkit_create_dialog (Dlg_head *h, int flags) h->grided = flags; h->idle_fn_tag = -1; if (!(flags & DLG_NO_TED)){ + g_warning ("Should never use GtkTed!!! Write a real dialog!!!"); ted = gtk_ted_new_layout (h->name, LIBDIR "/layout"); gtk_container_add (GTK_CONTAINER (win), ted); gtk_widget_show (ted); @@ -292,6 +293,8 @@ x_add_widget (Dlg_head *h, Widget_Item *w) if (!(h->grided & DLG_NO_TED)){ GtkTed *ted = GTK_TED (GTK_BIN (h->wdata)->child); + g_warning ("Should never use GtkTed!!! Write a real dialog!!!"); + gtk_ted_add (ted, GTK_WIDGET (w->widget->wdata), w->widget->tkname); bind_gtk_keys (GTK_WIDGET (w->widget->wdata), h); } @@ -313,6 +316,8 @@ x_init_dlg (Dlg_head *h) GtkTed *ted = GTK_TED (GTK_BIN (h->wdata)->child); Widget_Item *p, *first; + g_warning ("Should never use GtkTed!!! Write a real dialog!!!"); + first = p = h->current; do { gtk_ted_add (ted, GTK_WIDGET (p->widget->wdata), p->widget->tkname); diff --git a/gnome/magicdev.idl b/gnome/magicdev.idl new file mode 100644 index 000000000..7ccc6e52c --- /dev/null +++ b/gnome/magicdev.idl @@ -0,0 +1,6 @@ +module GNOME { + interface MagicDev { + void reread_config(); + boolean is_running(); + }; +}; diff --git a/vfs/ChangeLog b/vfs/ChangeLog index 0b735beef..5e04177c6 100644 --- a/vfs/ChangeLog +++ b/vfs/ChangeLog @@ -1,3 +1,10 @@ +1999-09-17 Federico Mena Quintero + + * smbfs.c: #define NO_CONFIG_H before including the samba + includes; this way it will not re=define HAVE_LIBREADLINE. This + situation sucks. Should we change the names of the widget.h + history_*() functions? + 1999-09-14 Norbert Warmuth * smbfs.c (various places): Store filenames in memory with the unix diff --git a/vfs/smbfs.c b/vfs/smbfs.c index 7d3ebb1be..d6f129a0e 100644 --- a/vfs/smbfs.c +++ b/vfs/smbfs.c @@ -28,6 +28,7 @@ /* don't load crap in "samba/include/includes.h" we don't use and which confilcts with definitions in other includes */ #undef HAVE_LIBREADLINE +#define NO_CONFIG_H #include "samba/include/includes.h" #include