diff src/gtk/misc-gtk.c @ 48:e5f6054590b5

2002-11-5 Brian Masney <[e-mail]> * lib/*.c src/gtk/*.c - removed function declarations for the static functions from the top of the file. I had to rearrange the order of a bunch of functions to avoid compiler warnings * lib/gftp.h - include sys/sysmacros.h. If major() and minor() isn't defined, give a compiler warning and define our own * lib/local.c (local_get_next_file) - if this file is a device, store the major/minor number in the file size * src/gtk/misc-gtk.c (add_file_listbox) - if this file is a device, use the major() and minor() macros to display the major and minor number

--- a/src/gtk/misc-gtk.c	Tue Nov 05 20:36:11 2002 +0000
+++ b/src/gtk/misc-gtk.c	Wed Nov 06 02:20:25 2002 +0000
@@ -20,15 +20,6 @@
 #include <gftp-gtk.h>
 static const char cvsid[] = "$Id$";
 
-static void set_menu_sensitive 			( gftp_window_data * wdata,
-						  char *path, 
-						  int sensitive );
-static gint delete_event 			( GtkWidget * widget, 
-						  GdkEvent * event, 
-						  gpointer data );
-static void trans_stop_button 			( GtkWidget * widget,
-						  gpointer data );
-
 static GtkWidget * statuswid;
 
 
@@ -298,6 +289,29 @@
 }
 
 
+static void
+set_menu_sensitive (gftp_window_data * wdata, char *path, int sensitive)
+{
+  GtkWidget * tempwid;
+  char * pos;
+
+  tempwid = NULL;
+
+  if (factory != NULL)
+    tempwid = gtk_item_factory_get_widget (factory, path);
+  if (tempwid)
+    gtk_widget_set_sensitive (tempwid, sensitive);
+
+  if ((pos = strchr (path + 1, '/')) == NULL)
+    pos = path;
+
+  if (wdata->ifactory)
+    tempwid = gtk_item_factory_get_widget (wdata->ifactory, pos);
+  if (tempwid)
+    gtk_widget_set_sensitive (tempwid, sensitive);
+}
+
+
 void
 update_window (gftp_window_data * wdata)
 {
@@ -369,29 +383,6 @@
 }  
 
 
-static void
-set_menu_sensitive (gftp_window_data * wdata, char *path, int sensitive)
-{
-  GtkWidget * tempwid;
-  char * pos;
-
-  tempwid = NULL;
-
-  if (factory != NULL)
-    tempwid = gtk_item_factory_get_widget (factory, path);
-  if (tempwid)
-    gtk_widget_set_sensitive (tempwid, sensitive);
-
-  if ((pos = strchr (path + 1, '/')) == NULL)
-    pos = path;
-
-  if (wdata->ifactory)
-    tempwid = gtk_item_factory_get_widget (wdata->ifactory, pos);
-  if (tempwid)
-    gtk_widget_set_sensitive (tempwid, sensitive);
-}
-
-
 GtkWidget *
 toolbar_pixmap (GtkWidget * widget, char *filename)
 {
@@ -805,8 +796,8 @@
     gtk_clist_set_text (GTK_CLIST (wdata->listbox), clist_num, 1, fle->file);
 
   if (fle->attribs && (*fle->attribs == 'b' || *fle->attribs == 'c'))
-    tempstr = g_strdup_printf ("%d, %d", (int) fle->size >> 16,
-                               (int) fle->size & 0xFF);
+    tempstr = g_strdup_printf ("%d, %d", major (fle->size),
+                               minor (fle->size));
   else
     tempstr = insert_commas (fle->size, NULL, 0);
 
@@ -1107,6 +1098,23 @@
 }
 
 
+static gint
+delete_event (GtkWidget * widget, GdkEvent * event, gpointer data)
+{
+  return (TRUE);
+}
+
+
+static void
+trans_stop_button (GtkWidget * widget, gpointer data)
+{
+  gftp_transfer * transfer;
+
+  transfer = data;
+  pthread_kill (((gftp_window_data *) transfer->fromwdata)->tid, SIGINT);
+}
+
+
 void
 update_directory_download_progress (gftp_transfer * transfer)
 {
@@ -1220,22 +1228,6 @@
 }
 
 
-static gint
-delete_event (GtkWidget * widget, GdkEvent * event, gpointer data)
-{
-  return (TRUE);
-}
-
-
-static void
-trans_stop_button (GtkWidget * widget, gpointer data)
-{
-  gftp_transfer * transfer;
-
-  transfer = data;
-  pthread_kill (((gftp_window_data *) transfer->fromwdata)->tid, SIGINT);
-}
-
 void
 display_cached_logs (void)
 {