1998-11-23 Federico Mena Quintero <federico@nuclecu.unam.mx>

* gdesktop.c: Put in a bunch of stubs for the functions in
	filegui.h.  These will be removed as the dialogs get
	custom-written for Gnome.

	* gmetadata.[ch]: Changed the function names to "gmeta_*".

	* gscreen.c (CLIST_FROM_SW): Use scrolled_window->child, as
	viewport is obsolete.

1998-11-23  Federico Mena Quintero  <federico@nuclecu.unam.mx>

	* dlg.c (dlg_try_hotkey): Removed unused declaration of input_event.
	(dlg_key_event): Return 1 if handled the tab key.

	* filegui.h: Added prototypes for file_progress_show_{source,target,deleting}().

config.h.in

@@ -101,9 +101,9 @@
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown
  */
 #undef STACK_DIRECTION
 
@@ -113,6 +113,9 @@
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef uid_t
 
+/* Define if the X Window System is missing or not being used.  */
+#undef X_DISPLAY_MISSING
+
 #undef VERSION
 #undef PACKAGE
 
@@ -405,9 +408,6 @@
 /* Define if you have the truncate function.  */
 #undef HAVE_TRUNCATE
 
-/* Define if you have the valloc function.  */
-#undef HAVE_VALLOC
-
 /* Define if you have the <argz.h> header file.  */
 #undef HAVE_ARGZ_H
 

gnome/ChangeLog

@@ -1,3 +1,14 @@
+1998-11-23  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gdesktop.c: Put in a bunch of stubs for the functions in
+	filegui.h.  These will be removed as the dialogs get
+	custom-written for Gnome.
+
+	* gmetadata.[ch]: Changed the function names to "gmeta_*".
+
+	* gscreen.c (CLIST_FROM_SW): Use scrolled_window->child, as
+	viewport is obsolete.
+
 1998-11-19  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* Makefile.in (OOBJS): Do not link ../src/filegui.o.  GMC does not

gnome/gdesktop.c

@@ -471,7 +471,7 @@ desktop_icon_info_new (char *filename, int auto_pos, int xpos, int ypos)
 
 	/* Create the icon structure */
 
-	icon_name = meta_get_icon_for_file (full_name);
+	icon_name = gmeta_get_icon_for_file (full_name);
 
 	dii = g_new (struct desktop_icon_info, 1);
 	dii->dicon = desktop_icon_new (icon_name, filename);
@@ -597,7 +597,7 @@ load_initial_desktop_icons (void)
 
 		full_name = g_concat_dir_and_file (desktop_directory, dirent->d_name);
 
-		have_pos = meta_get_icon_pos (full_name, &x, &y);
+		have_pos = gmeta_get_icon_pos (full_name, &x, &y);
 		desktop_icon_info_new (dirent->d_name, !have_pos, x, y);
 
 		g_free (full_name);
@@ -642,7 +642,7 @@ save_icons_pos (void)
 			dii = l->data;
 
 			filename = g_concat_dir_and_file (desktop_directory, dii->filename);
-			meta_set_icon_pos (filename, dii->x, dii->y);
+			gmeta_set_icon_pos (filename, dii->x, dii->y);
 			g_free (filename);
 		}
 }
@@ -689,7 +689,94 @@ desktop_destroy (void)
 
 
 
+#if 1
+/* Stubs for filegui.h */
 
+#include "file.h"
+#include "panel.h"
+
+FileProgressStatus
+file_progress_show_source (char *path)
+{
+	g_warning ("Implement this function!\n");
+	return FILE_CONT;
+}
+
+FileProgressStatus
+file_progress_show_target (char *path)
+{
+	g_warning ("Implement this function!\n");
+	return FILE_CONT;
+}
+
+FileProgressStatus
+file_progress_show_deleting (char *path)
+{
+	g_warning ("Implement this function!\n");
+	return FILE_CONT;
+}
+
+FileProgressStatus
+file_progress_show (long done, long total)
+{
+	g_warning ("Implement this function!\n");
+	return FILE_CONT;
+}
+
+FileProgressStatus
+file_progress_show_count (long done, long total)
+{
+	g_warning ("Implement this function!\n");
+	return FILE_CONT;
+}
+
+FileProgressStatus
+file_progress_show_bytes (long done, long total)
+{
+	g_warning ("Implement this function!\n");
+	return FILE_CONT;
+}
+
+FileProgressStatus
+file_progress_real_query_replace (enum OperationMode mode, char *destname, struct stat *_s_stat, struct stat *_d_stat)
+{
+	g_warning ("Implement this function!\n");
+	return FILE_CONT;
+}
+
+void
+file_progress_set_stalled_label (char *stalled_msg)
+{
+	g_warning ("Implement this function!\n");
+}
+
+char *
+panel_operate_generate_prompt (char* cmd_buf, WPanel* panel, int operation, int only_one, struct stat* src_stat)
+{
+	g_warning ("Implement this function!\n");
+	return NULL;
+}
+
+char *
+file_mask_dialog (FileOperation operation, char *text, char *def_text, int only_one, int *do_background)
+{
+	g_warning ("Implement this function!\n");
+	return NULL;
+}
+
+void
+create_op_win (FileOperation op, int with_eta)
+{
+	g_warning ("Implement this function!\n");
+}
+
+void
+destroy_op_win (void)
+{
+	g_warning ("Implement this function!\n");
+}
+
+#endif
 
 
 #else

gnome/gmetadata.c

@@ -18,7 +18,7 @@
 
 
 /**
- * meta_get_icon_for_file
+ * gmeta_get_icon_for_file
  * @filename:	The name of the file to get the icon for.
  *
  * Computes the name of the file that holds the icon for the specified file.  The
@@ -28,7 +28,7 @@
  * Returns the icon's file name.
  */
 char *
-meta_get_icon_for_file (char *filename)
+gmeta_get_icon_for_file (char *filename)
 {
 	int size;
 	char *buf;
@@ -52,7 +52,7 @@ meta_get_icon_for_file (char *filename)
 }
 
 /**
- * meta_get_icon_pos
+ * gmeta_get_icon_pos
  * @filename:	The file under ~/desktop for which to get the icon position
  * @x:		The x position will be stored here.  Must be non-NULL.
  * @y:		The y position will be stored here.  Must be non-NULL.
@@ -60,10 +60,10 @@ meta_get_icon_for_file (char *filename)
  * Checks if the specified file has an icon position associated to it.  If so, returns TRUE and
  * fills in the x and y values.  Otherwise it returns FALSE and x and y are not modified.
  *
- * Icon position information is expected to be saved using the meta_set_icon_pos() function.
+ * Icon position information is expected to be saved using the gmeta_set_icon_pos() function.
  */
 int
-meta_get_icon_pos (char *filename, int *x, int *y)
+gmeta_get_icon_pos (char *filename, int *x, int *y)
 {
 	int size;
 	char *buf;
@@ -87,16 +87,16 @@ meta_get_icon_pos (char *filename, int *x, int *y)
 }
 
 /**
- * meta_set_icon_pos
+ * gmeta_set_icon_pos
  * @filename:	The file for which to save icon position information
  * @x:		X position of the icon
  * @y:		Y position of the icon
  *
  * Saves the icon position information for the specified file.  This is expected to be read back
- * using the meta_get_icon_pos() function.
+ * using the gmeta_get_icon_pos() function.
  */
 void
-meta_set_icon_pos (char *filename, int x, int y)
+gmeta_set_icon_pos (char *filename, int x, int y)
 {
 	char buf[100];
 

gnome/gmetadata.h

@@ -10,15 +10,15 @@
 
 
 /* Returns the icon filename for the specified file.  You must free the name. */
-char *meta_get_icon_for_file (char *filename);
+char *gmeta_get_icon_for_file (char *filename);
 
 /* Returns the coordinates of the icon corresponding to the specified file.  If no position
  * has been set, returns FALSE.  Else it returns TRUE and sets the *x and *y values.
  */
-int meta_get_icon_pos (char *filename, int *x, int *y);
+int gmeta_get_icon_pos (char *filename, int *x, int *y);
 
 /* Saves the icon position for the specified file */
-void meta_set_icon_pos (char *filename, int x, int y);
+void gmeta_set_icon_pos (char *filename, int x, int y);
 
 
 #endif

gnome/gscreen.c

@@ -97,7 +97,7 @@ typedef void (*context_menu_callback)(GtkWidget *, void *);
 
 static void panel_file_list_configure_contents (GtkWidget *sw, WPanel *panel, int main_width, int height);
 
-#define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_SCROLLED_WINDOW (panel_list)->viewport)
+#define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_SCROLLED_WINDOW (panel_list)->child)
 
 
 void
@@ -465,7 +465,7 @@ panel_file_list_configure_contents (GtkWidget *sw, WPanel *panel, int main_width
 	} else
 		shrink_space = 0;
 
-	clist = GTK_CLIST (GTK_SCROLLED_WINDOW (sw)->viewport);
+	clist = CLIST_FROM_SW (sw);
 
 	gtk_clist_freeze (clist);
 
@@ -860,7 +860,7 @@ panel_file_list_compute_lines (GtkScrolledWindow *sw, WPanel *panel, int height)
 
 		lost_pixels = scrollbar_space + scrollbar_width;
 	}
-	panel->widget.lines = (height-lost_pixels) / (GTK_CLIST (sw->viewport)->row_height + CELL_SPACING);
+	panel->widget.lines = (height-lost_pixels) / (CLIST_FROM_SW (sw)->row_height + CELL_SPACING);
 }
 
 static void

src/ChangeLog

@@ -1,3 +1,10 @@
+1998-11-23  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* dlg.c (dlg_try_hotkey): Removed unused declaration of input_event.
+	(dlg_key_event): Return 1 if handled the tab key.
+
+	* filegui.h: Added prototypes for file_progress_show_{source,target,deleting}().	
+
 Sun Nov 22 22:30:50 1998  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* autogen.sh: replaced "cat *.m4" with a call to aclocal. Concatenate

src/dlg.c

@@ -642,7 +642,6 @@ static int dlg_try_hotkey (Dlg_head *h, int d_key)
     Widget_Item *hot_cur;
     Widget_Item *previous;
     int    handled, c;
-    extern input_event ();
     
     /*
      * Explanation: we don't send letter hotkeys to other widgets if
@@ -733,6 +732,7 @@ int dlg_key_event (Dlg_head *h, int d_key)
 
 	return handled;
     }
+    return 1;
 }
 
 static INLINE int dlg_mouse_event (Dlg_head *h, Gpm_Event *event)

src/filegui.h

@@ -8,6 +8,9 @@ FileProgressStatus file_progress_check_buttons (void);
 FileProgressStatus file_progress_show          (long done, long total);
 FileProgressStatus file_progress_show_count    (long done, long total);
 FileProgressStatus file_progress_show_bytes    (long done, long total);
+FileProgressStatus file_progress_show_source   (char *path);
+FileProgressStatus file_progress_show_target   (char *path);
+FileProgressStatus file_progress_show_deleting (char *path);
 FileProgressStatus file_progress_real_query_replace (enum OperationMode mode,
 						     char *destname,
 						     struct stat *_s_stat,