mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-02-09 11:54:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

1999-09-17 Federico Mena Quintero <federico@redhat.com>

Browse Source 
* 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  <federico@redhat.com>

	* gmain.c (x_init_dlg): Display a warning if the GtkTed code path
	is ever reached.
	(xtoolkit_create_dialog): Likewise.
	(x_add_widget): Likewise.
This commit is contained in:
Miguel de Icaza 1999-09-17 20:11:53 +00:00
parent 43e054c11f
commit 356209d996
6 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnome/ChangeLog
View File

@ -1,3 +1,10 @@
1999-09-17 Federico Mena Quintero <federico@redhat.com>
* 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 <otaylor@redhat.com>
* gmount.c: Remove the HAVE_MAGICDEV conditional.

26
gnome/Makefile.in
View File

@ -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); \

5
gnome/gmain.c
View File

@ -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);

6
gnome/magicdev.idl Normal file
View File

@ -0,0 +1,6 @@
module GNOME {
interface MagicDev {
void reread_config();
boolean is_running();
};
};

7
vfs/ChangeLog
View File

@ -1,3 +1,10 @@
1999-09-17 Federico Mena Quintero <federico@redhat.com>
* 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 <nwarmuth@privat.circular.de>
* smbfs.c (various places): Store filenames in memory with the unix

1
vfs/smbfs.c
View File

@ -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 <string.h>