mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-22 20:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

popt works better now (at least, the new popt should compile into

Browse Source 
non-GNOME mc).
This commit is contained in:
Elliot Lee 1998-11-04 19:03:44 +00:00
parent 4973489859
commit 44936ff8a1
6 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@ -13,4 +13,4 @@ autoheader
autoconf
)
$srcdir/configure $*
$srcdir/configure --enable-maintainer-mode $*

7
gnome/Makefile.in
View File

@ -67,7 +67,9 @@ ICONS = \
#
# These objects from ../src do not depend on HAVE_X / HAVE_GNOME??
#
LOBJS = mad.o
LOBJS = mad.o
# popt.o poptconfig.o \
# popthelp.o poptparse.o findme.o
#
# These objects from ../src do depend on HAVE_GNOME
@ -78,8 +80,7 @@ OOBJS = main.o dlg.o screen.o widget.o wtools.o info.o boxes.o \
win.o color.o profile.o user.o ext.o setup.o tree.o \
subshell.o terms.o achown.o fsusage.o mountlist.o \
@XCURSES@ @REGEX_O@ complete.o command.o \
option.o cmd.o utilunix.o xslint.o popt.o poptconfig.o \
popthelp.o poptparse.o findme.o
option.o cmd.o utilunix.o xslint.o
OBJS = $(LOBJS) $(OOBJS) \
gdesktop-icon.o \

2
gnome/gconf.h
View File

@ -27,7 +27,7 @@
#define PORT_HAS_RADIO_FOCUS_ITEM 1
#define PORT_HAS_DIALOG_STOP 1
#define PORT_HAS_DISPLAY_MINI_INFO 1
#define PORT_WANTS_ARGP 1
/* #define PORT_WANTS_ARGP 0 */
#define PORT_WIDGET_WANTS_HISTORY 0
#define PORT_HAS_UPDATE_MARKS 1
#define PORT_HAS_RADIO_TOGGLE 1

23
gnome/gmain.c
View File

@ -442,8 +442,7 @@ dialog_panel_callback (struct Dlg_head *h, int id, int msg)
return 0;
}
extern GList *directory_list;
extern GList *geometry_list;
extern char *cmdline_geometry;
typedef struct {
char *dir; char *geometry;
@ -516,28 +515,26 @@ create_panels (void)
desktop_dlg = create_dlg (0, 0, 24, 80, 0, dialog_panel_callback, "[panel]", "midnight", DLG_NO_TED);
#if 0
if (directory_list){
g = geometry_list;
for (p = directory_list; p; p = p->next){
if (g){
geo = g->data;
g = g->next;
} else
geo = NULL;
create_one_panel (p->data, geo);
create_one_panel (p->data, cmdline_geometry);
}
panel = NULL;
} else {
char *geometry = geometry_list ? geometry_list->data : NULL;
panel = create_one_panel (".", geometry);
} else
#endif
{
panel = create_one_panel (".", cmdline_geometry);
if (nowindows){
gtk_idle_add (idle_destroy_window, panel);
panel->widget.options |= W_PANEL_HIDDEN;
}
}
#if 0
g_list_free (directory_list);
g_list_free (geometry_list);
#endif
run_dlg (desktop_dlg);

2
gnome/gprop.c
View File

@ -140,7 +140,7 @@ gprop_exec_get_data (GpropExec *ge, GnomeDesktopEntry *dentry)
GtkEntry *entry;
entry = GTK_ENTRY (gnome_entry_gtk_entry (GNOME_ENTRY (ge->entry)));
gnome_string_array_free (dentry->exec);
g_strfreev (dentry->exec);
gnome_config_make_vector (gtk_entry_get_text (entry),
&dentry->exec_length, &dentry->exec);
dentry->terminal = GTK_TOGGLE_BUTTON (ge->check)->active;

7
src/Makefile.in
View File

@ -24,7 +24,7 @@ SRCS = dir.c util.c main.c screen.c dialog.c key.c keyxdef.c menu.c\
hotlist.c achown.c layout.c fsusage.c mountlist.c regex.c \
complete.c slint.c command.c cmd.c panelize.c learn.c \
listmode.c utilunix.c background.c rxvt.c \
text.c popt.c findme.c
text.c popt.c findme.c poptparse.c poptconfig.c popthelp.c
HDRS = color.h file.h mouse.h user.h dialog.h find.h main.h \
util.h dir.h global.h menu.h panel.h win.h mem.h \
@ -34,7 +34,7 @@ HDRS = color.h file.h mouse.h user.h dialog.h find.h main.h \
hotlist.h layout.h fsusage.h mountlist.h regex.h complete.h \
myslang.h command.h cmd.h tty.h fs.h panelize.h achown.h \
learn.h listmode.h features.inc background.h \
x.h textconf.h i18n.h findme.h
x.h textconf.h i18n.h findme.h popt.h
OBJS = dir.o util.o screen.o dialog.o key.o keyxdef.o menu.o\
file.o win.o color.o help.o find.o profile.o user.o view.o \
@ -44,7 +44,8 @@ OBJS = dir.o util.o screen.o dialog.o key.o keyxdef.o menu.o\
hotlist.o achown.o layout.o fsusage.o mountlist.o \
@XCURSES@ @REGEX_O@ complete.o slint.o command.o \
cmd.o main.o panelize.o learn.o listmode.o utilunix.o \
background.o rxvt.o text.o
background.o rxvt.o text.o \
popt.o findme.o poptparse.o poptconfig.o popthelp.o
#
# Distribution variables