diff -crN ./nautilus/components/emblem/Nautilus_View_emblem.server.in.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/emblem/Nautilus_View_emblem.server.in.in *** ./nautilus/components/emblem/Nautilus_View_emblem.server.in.in Sat Sep 28 03:25:09 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/emblem/Nautilus_View_emblem.server.in.in Wed Jul 9 19:12:25 2003 *************** *** 1,7 **** --- 1,7 ---- diff -crN ./nautilus/components/hardware/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/hardware/Makefile.am *** ./nautilus/components/hardware/Makefile.am Fri Sep 20 11:33:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/hardware/Makefile.am Wed Jul 9 19:04:53 2003 *************** *** 8,13 **** --- 8,14 ---- -I$(top_srcdir) \ $(DISABLE_DEPRECATED_CFLAGS) \ $(COMPONENT_CFLAGS) \ + $(LIBGTOP_CFLAGS) \ $(NULL) server_in_files = Nautilus_View_hardware.server.in.in *************** *** 31,36 **** --- 32,38 ---- $(top_builddir)/libnautilus/libnautilus.la \ $(top_builddir)/libnautilus-private/libnautilus-private.la \ $(COMPONENT_LIBS) \ + $(LIBGTOP_LIBS) \ $(NULL) EXTRA_DIST = $(server_in_files) $(nautilus_hardware_view_SOURCES) diff -crN ./nautilus/components/hardware/Nautilus_View_hardware.server.in.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/hardware/Nautilus_View_hardware.server.in.in *** ./nautilus/components/hardware/Nautilus_View_hardware.server.in.in Wed Jul 17 00:17:30 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/hardware/Nautilus_View_hardware.server.in.in Wed Jul 9 19:05:07 2003 *************** *** 1,7 **** --- 1,7 ---- diff -crN ./nautilus/components/hardware/nautilus-hardware-view.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/hardware/nautilus-hardware-view.c *** ./nautilus/components/hardware/nautilus-hardware-view.c Tue Aug 6 15:09:21 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/hardware/nautilus-hardware-view.c Wed Jul 9 19:05:30 2003 *************** *** 48,53 **** --- 48,59 ---- #include #include #include + #ifdef HAVE_LIBGTOP + #include + #include + #include + #include + #endif struct _NautilusHardwareViewDetails { NautilusView *nautilus_view; *************** *** 76,81 **** --- 82,107 ---- static GtkTargetEntry hardware_dnd_target_table[] = { { "application/x-color", 0, TARGET_COLOR }, }; + #ifdef LIST_DISK_CMD + typedef enum { + UNKNOWN, + DISK, + CDROM + } device_type_t; + + typedef struct device_entry { + gchar* name; + device_type_t type; + gchar* status; + gchar* location; + gchar* description; + } device_entry_t; + + typedef struct device_list { + gint current; + gchar** devices; + } device_list_t; + #endif static void nautilus_hardware_view_drag_data_received (GtkWidget *widget, GdkDragContext *context, *************** *** 106,111 **** --- 132,140 ---- object_class->finalize = nautilus_hardware_view_finalize; widget_class->drag_data_received = nautilus_hardware_view_drag_data_received; + #ifdef HAVE_LIBGTOP + glibtop_init_r (&glibtop_global_server, 0, 0); + #endif } /* property bag property access routines */ *************** *** 206,211 **** --- 235,241 ---- return BONOBO_OBJECT (hardware_view->details->nautilus_view); } + #ifndef HAVE_LIBGTOP static char * read_proc_info (const char* proc_filename) { *************** *** 262,273 **** --- 292,384 ---- g_strfreev (info_array); return field_data; } + #endif /* get descriptive text about the CPU */ static char * get_CPU_description (int nth) { + #if HAVE_LIBGTOP + char *result; + char *key; + static glibtop_sysinfo *sysinfo = NULL; + char *architecture, *implementation; + char *icache_size, *dcache_size; + char *model, *cache_size; + int i; + char *frequency = NULL; + char* mhz; + #ifdef GET_CPU_HZ_CMD + gchar* cmd; + GError *error; + gint status; + gboolean ok; + #endif /* GET_CPU_HZ_CMD */ + + if (sysinfo == NULL) + sysinfo = glibtop_get_sysinfo(); + + if (nth >= sysinfo->ncpu) + return NULL; + + for (i = 0; i < sysinfo->cpuinfo[nth].labels->len ; i++) + { + key = g_ptr_array_index (sysinfo->cpuinfo[nth].labels, i); + + if (strcmp(key, "architecture") == 0) + { + architecture = (char*)g_hash_table_lookup(sysinfo->cpuinfo[nth].values, key); + } + else if (strcmp(key, "implementation") == 0) + { + implementation = (char*)g_hash_table_lookup(sysinfo->cpuinfo[nth].values, key); + } + else if (strcmp(key, "L1 instruction cache size") == 0) + { + icache_size = (char*)g_hash_table_lookup(sysinfo->cpuinfo[nth].values, key); + } + else if (strcmp(key, "L1 data cache size") == 0) + { + dcache_size = (char*)g_hash_table_lookup(sysinfo->cpuinfo[nth].values, key); + } + } + + model = g_strdup_printf("%s %s", architecture, implementation); + cache_size = g_strdup_printf("%d+%d", atol(icache_size) >> 10, + atol(dcache_size) >> 10); + #ifdef GET_CPU_HZ_CMD + cmd = g_strdup_printf (GET_CPU_HZ_CMD, nth); + + ok = g_spawn_command_line_sync(cmd, &frequency, NULL, &status, &error); + g_free(cmd); + if (!ok || (status != 0)) + { + g_free(frequency); + frequency = NULL; + } + #endif /* GET_CPU_HZ_CMD */ + + if (frequency != NULL) + { + /* remove 6 digits and '\n' */ + + mhz = g_strdup(frequency); + mhz[strlen(mhz) - 7] = '\0'; + result = g_strdup_printf (_("%s CPU\n" "%s MHz\n" "%s K cache size"), + model, mhz, cache_size); + g_free(mhz); + } + else + { + result = g_strdup_printf (_("%s CPU\n" "%s K cache size"), + model, cache_size); + } + g_free(model); + g_free(cache_size); + + return result; + #else char *proc_data; char *model, *speed, *cache_size; char *localized_speed; *************** *** 315,326 **** --- 426,451 ---- g_free (cache_size); return result; + #endif /* LIBGTOP */ } /* get descriptive information about main memory */ static char * get_RAM_description (void) { + #ifdef HAVE_LIBGTOP + char* result; + glibtop_mem mem_info; + + glibtop_get_mem(&mem_info); + + if ((mem_info.total >> 30) > 0) { + result = g_strdup_printf (_("%lu GB RAM"), (gulong)(mem_info.total >> 30)+1); + } else { + result = g_strdup_printf (_("%lu MB RAM"), (gulong)(mem_info.total >> 20)+1); + } + return result; + #else char *temp_str, *result; char *proc_data; gulong ram_size; *************** *** 348,355 **** --- 473,684 ---- g_free (proc_data); return result; + #endif /* HAVE_LIBGTOP */ + } + + #ifdef LIST_DISK_CMD + device_list_t * + open_device_list(void) + { + gboolean result; + gchar* disk; + gchar* cdrom; + gchar* all_devices; + device_list_t* list; + gint status; + GError* error; + + list = g_malloc(sizeof(device_list_t)); + if (list == NULL) + return NULL; + + list->current = 0; + + result = g_spawn_command_line_sync(LIST_DISK_CMD, &disk, NULL, + &status, &error); + if (!result) + { + g_free(list); + return NULL; + } + + if (status != 0) + { + g_free(disk); + g_free(list); + return NULL; + } + + result = g_spawn_command_line_sync(LIST_CDROM_CMD, &cdrom, NULL, + &status, &error); + if ((!result) || (status != 0)) + { + g_free(cdrom); + list->devices = g_strsplit(disk, "\n", 0); + g_free(disk); + return list; + } + + all_devices = g_strconcat(disk, cdrom, NULL); + g_free(disk); + g_free(cdrom); + + list->devices = g_strsplit(all_devices, "\n", 0); + g_free(all_devices); + + return list; + } + + device_entry_t * + next_device(device_list_t* list) + { + static device_entry_t entry; + gchar* properties; + gchar* type; + + if (list == NULL) + return NULL; + + if (list->devices[list->current] == NULL) + return NULL; + + properties = list->devices[list->current]; + + /* name */ + + entry.name = properties; + + /* seek next entry */ + + while (*properties != '|') + { + if (*properties == 0) + return NULL; + properties++; + } + *properties++ = 0; + + /* device type */ + + type = properties; + + /* seek next entry */ + + while (*properties != '|') + { + if (*properties == 0) + return NULL; + properties++; + } + *properties++ = 0; + + /* device type */ + + if (strcmp("disk", type) == 0) + { + entry.type = DISK; + } + if (strcmp("cdrom", type) == 0) + { + entry.type = CDROM; + } + else + { + entry.type = UNKNOWN; + } + + /* status */ + + entry.status = properties; + + /* seek next entry */ + + while (*properties != '|') + { + if (*properties == 0) + return NULL; + properties++; + } + *properties++ = 0; + + /* location */ + + entry.location = properties; + + /* seek next entry */ + + while (*properties != '|') + { + if (*properties == 0) + return NULL; + properties++; + } + *properties++ = 0; + + /* description */ + + entry.description = properties; + + list->current++; + + return &entry; } + void + close_device_list(device_list_t* list) + { + if (list != NULL) + { + g_strfreev(list->devices); + g_free(list); + } + } + + char* get_device_description(device_entry_t* entry) + { + gchar* cmd; + gboolean result; + gchar* size; + GError *error; + gint status; + GString *string_data = g_string_new(""); + gchar* description; + gchar* num_str; + gulong capacity; + + g_string_append(string_data, entry->description); + + #ifdef GET_SIZE_CMD + cmd = g_strdup_printf (GET_SIZE_CMD, entry->name); + + result = g_spawn_command_line_sync(cmd, &size, NULL, + &status, &error); + g_free(cmd); + + if (result && (status == 0)) + { + capacity = strtoul (size, NULL, 10); + + if (capacity >= 1000) { + num_str = g_strdup_printf (_("%lu GB"), capacity / 1000); + } else { + num_str = g_strdup_printf (_("%lu MB"), capacity); + } + + g_string_append (string_data, "\n"); + g_string_append (string_data, num_str); + g_free (num_str); + } + + g_free(size); + #endif /* GET_SIZE_CMD */ + + description = string_data->str; + g_string_free (string_data, FALSE); + + return description; + } + #else static char * get_IDE_description (const char *device) { *************** *** 416,422 **** return result; } ! /* shared utility to allocate a title for a form */ --- 745,751 ---- return result; } ! #endif /* LIST_DISK_CMD */ /* shared utility to allocate a title for a form */ *************** *** 469,474 **** --- 798,822 ---- static int update_uptime_text (gpointer callback_data) { + #ifdef HAVE_LIBGTOP + glibtop_uptime uptime_info; + char *uptime_text; + int uptime_days, uptime_hours, uptime_minutes; + + glibtop_get_uptime(&uptime_info); + + uptime_days = uptime_info.uptime / 86400; + uptime_hours = (uptime_info.uptime - (uptime_days * 86400)) / 3600; + uptime_minutes = (uptime_info.uptime - (uptime_days * 86400) - (uptime_hours * 3600)) / 60; + + uptime_text = g_strdup_printf (_("Uptime is %d days, %d hours, %d minutes"), uptime_days, uptime_hours, uptime_minutes); + + gtk_label_set_text (NAUTILUS_HARDWARE_VIEW (callback_data)->details->uptime_label, uptime_text); + + g_free (uptime_text); + + return TRUE; + #else char *uptime_data, *uptime_text; double uptime_seconds; int uptime_days, uptime_hours, uptime_minutes; *************** *** 486,491 **** --- 834,840 ---- g_free (uptime_data); return TRUE; + #endif /* HAVE_LIBGTOP */ } /* set up the widgetry for the overview page */ *************** *** 496,504 **** --- 845,858 ---- GtkWidget *temp_widget, *pixmap_widget, *temp_box; GtkWidget *table; int element_index; + #ifdef LIST_DISK_CMD + device_list_t* handle; + device_entry_t* entry; + #else DIR *directory; struct dirent* entry; char *device, *proc_file, *ide_media; + #endif /* allocate a vbox as the container */ view->details->form = gtk_vbox_new(FALSE,0); *************** *** 554,559 **** --- 908,953 ---- gtk_box_pack_start (GTK_BOX(temp_box), temp_widget, 0, 0, 0 ); gtk_widget_show (temp_widget); + #ifdef LIST_DISK_CMD + handle = open_device_list(); + while((entry = next_device(handle)) != NULL) + { + temp_box = gtk_vbox_new(FALSE, 4); + add_element_to_table (table, temp_box, element_index++); + gtk_widget_show(temp_box); + + /* Set the icon depending on the type of device */ + + if (entry->type == DISK) + { + file_name = nautilus_pixmap_file ("HD_drive.png"); + } + else if (entry->type == CDROM) + { + file_name = nautilus_pixmap_file ("CD_drive.png"); + } + else + { + file_name = nautilus_pixmap_file ("HD_drive.png"); + } + + pixmap_widget = gtk_image_new_from_file (file_name); + gtk_box_pack_start (GTK_BOX(temp_box), pixmap_widget, 0, 0, 0); + gtk_widget_show(pixmap_widget); + + /* get device description */ + + temp_text = get_device_description (entry); + temp_widget = gtk_label_new (temp_text); + eel_gtk_label_set_scale (GTK_LABEL (temp_widget), PANGO_SCALE_LARGE); + gtk_label_set_justify (GTK_LABEL (temp_widget), GTK_JUSTIFY_CENTER); + + g_free(temp_text); + gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0); + gtk_widget_show(temp_widget); + } + close_device_list(handle); + #else /* Set up ide devices : by Shane Butler */ /* Open the ide devices directory */ if((directory = opendir("/proc/ide/")) != NULL) { *************** *** 600,605 **** --- 994,1000 ---- } closedir(directory); } + #endif /* HAVE_LIBGTOP */ /* allocate the uptime label */ view->details->uptime_label = GTK_LABEL (gtk_label_new ("")); *************** *** 769,775 **** case TARGET_COLOR: /* Let the background change based on the dropped color. */ eel_background_receive_dropped_color (eel_get_widget_background (widget), ! widget, x, y, selection_data); break; default: --- 1164,1170 ---- case TARGET_COLOR: /* Let the background change based on the dropped color. */ eel_background_receive_dropped_color (eel_get_widget_background (widget), ! widget, context->action, x, y, selection_data); break; default: diff -crN ./nautilus/components/history/Nautilus_View_history.server.in.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/history/Nautilus_View_history.server.in.in *** ./nautilus/components/history/Nautilus_View_history.server.in.in Mon Jul 22 17:52:08 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/history/Nautilus_View_history.server.in.in Wed Jul 9 19:11:24 2003 *************** *** 1,7 **** --- 1,7 ---- diff -crN ./nautilus/components/history/nautilus-history-view.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/history/nautilus-history-view.c *** ./nautilus/components/history/nautilus-history-view.c Mon Jul 15 11:58:09 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/history/nautilus-history-view.c Wed Jul 9 19:06:12 2003 *************** *** 57,63 **** HISTORY_VIEW_COLUMN_ICON, HISTORY_VIEW_COLUMN_NAME, HISTORY_VIEW_COLUMN_BOOKMARK, ! HISTORY_VIEW_COLUMN_COUNT, }; BONOBO_CLASS_BOILERPLATE (NautilusHistoryView, nautilus_history_view, --- 57,63 ---- HISTORY_VIEW_COLUMN_ICON, HISTORY_VIEW_COLUMN_NAME, HISTORY_VIEW_COLUMN_BOOKMARK, ! HISTORY_VIEW_COLUMN_COUNT }; BONOBO_CLASS_BOILERPLATE (NautilusHistoryView, nautilus_history_view, diff -crN ./nautilus/components/image_properties/Nautilus_View_image_properties.server.in.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/image_properties/Nautilus_View_image_properties.server.in.in *** ./nautilus/components/image_properties/Nautilus_View_image_properties.server.in.in Mon Feb 10 10:39:46 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/image_properties/Nautilus_View_image_properties.server.in.in Wed Jul 9 19:14:36 2003 *************** *** 1,7 **** --- 1,7 ---- diff -crN ./nautilus/components/image_properties/nautilus-image-properties-view.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/image_properties/nautilus-image-properties-view.c *** ./nautilus/components/image_properties/nautilus-image-properties-view.c Mon Jan 13 12:11:57 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/image_properties/nautilus-image-properties-view.c Wed Jul 9 19:14:21 2003 *************** *** 45,51 **** }; enum { ! PROP_URI, }; static GObjectClass *parent_class = NULL; --- 45,51 ---- }; enum { ! PROP_URI }; static GObjectClass *parent_class = NULL; *************** *** 259,262 **** bonobo_object_release_unref (BONOBO_OBJREF (pb), NULL); } ! BONOBO_TYPE_FUNC (NautilusImagePropertiesView, BONOBO_TYPE_CONTROL, nautilus_image_properties_view); --- 259,262 ---- bonobo_object_release_unref (BONOBO_OBJREF (pb), NULL); } ! BONOBO_TYPE_FUNC (NautilusImagePropertiesView, BONOBO_TYPE_CONTROL, nautilus_image_properties_view) diff -crN ./nautilus/components/notes/Nautilus_View_notes.server.in.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/notes/Nautilus_View_notes.server.in.in *** ./nautilus/components/notes/Nautilus_View_notes.server.in.in Mon Feb 10 10:39:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/notes/Nautilus_View_notes.server.in.in Wed Jul 9 19:13:40 2003 *************** *** 1,7 **** --- 1,7 ---- diff -crN ./nautilus/components/notes/nautilus-notes.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/notes/nautilus-notes.c *** ./nautilus/components/notes/nautilus-notes.c Sat Nov 9 11:28:25 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/notes/nautilus-notes.c Wed Jul 9 19:13:23 2003 *************** *** 59,65 **** /* property bag getting and setting routines */ enum { TAB_IMAGE, ! NOTES_URI, }; typedef struct { --- 59,65 ---- /* property bag getting and setting routines */ enum { TAB_IMAGE, ! NOTES_URI }; typedef struct { diff -crN ./nautilus/components/throbber/nautilus-throbber.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/throbber/nautilus-throbber.c *** ./nautilus/components/throbber/nautilus-throbber.c Fri Feb 28 15:52:52 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/throbber/nautilus-throbber.c Wed Jul 9 19:15:01 2003 *************** *** 26,31 **** --- 26,32 ---- */ #include + #include #include "nautilus-throbber.h" #include *************** *** 45,51 **** #include #include #include - #include #define THROBBER_DEFAULT_TIMEOUT 100 /* Milliseconds Per Frame */ --- 46,51 ---- diff -crN ./nautilus/components/tree/Nautilus_View_tree.server.in.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/tree/Nautilus_View_tree.server.in.in *** ./nautilus/components/tree/Nautilus_View_tree.server.in.in Wed Jul 17 00:17:47 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/components/tree/Nautilus_View_tree.server.in.in Wed Jul 9 19:15:52 2003 *************** *** 1,7 **** --- 1,7 ---- diff -crN ./nautilus/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/configure.in *** ./nautilus/configure.in Mon Mar 10 19:16:33 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/configure.in Wed Jul 9 15:12:14 2003 *************** *** 45,50 **** --- 45,56 ---- AM_DISABLE_STATIC AM_PROG_LIBTOOL + AC_CHECK_LIB(popt, poptGetArg, POPT_LIBS=-lpopt, + [AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([[ + *** Couldn't find popt. Please download and install from + *** ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ and try again.]]))]) + AC_SUBST(POPT_LIBS) + PKG_CHECK_MODULES(ALL, \ esound >= $ESOUND_REQUIRED \ bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED \ *************** *** 106,111 **** --- 112,118 ---- AC_CHECK_FUNCS(setmntent endmntent hasmntopt getmntinfo) AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/vfstab.h sys/cdio.h sys/mount.h) + AC_CHECK_HEADERS(sys/mntctl.h sys/vfs.h sys/vmount.h) dnl ========================================================================== *************** *** 265,271 **** AC_SUBST(LIBNAUTILUS_CFLAGS) LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" AC_SUBST(LIBNAUTILUS_LIBS) ! LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`" AC_SUBST(LIBNAUTILUS_IDL_INCLUDES) dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires") --- 272,283 ---- AC_SUBST(LIBNAUTILUS_CFLAGS) LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`" AC_SUBST(LIBNAUTILUS_LIBS) ! LIBNAUTILUS_IDL_INCLUDES_tmp="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`" ! LIBNAUTILUS_IDL_INCLUDES="" ! for dir in ${LIBNAUTILUS_IDL_INCLUDES_tmp} ! do ! LIBNAUTILUS_IDL_INCLUDES="${LIBNAUTILUS_IDL_INCLUDES} -I${dir}" ! done AC_SUBST(LIBNAUTILUS_IDL_INCLUDES) dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires") *************** *** 274,280 **** AC_SUBST(CORE_CFLAGS) CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" AC_SUBST(CORE_LIBS) ! CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`" AC_SUBST(CORE_IDL_INCLUDES) dnl typical components --- 286,296 ---- AC_SUBST(CORE_CFLAGS) CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs" AC_SUBST(CORE_LIBS) ! CORE_IDL_INCLUDES_tmp="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`" ! for dir in ${CORE_IDL_INCLUDES_tmp} ! do ! CORE_IDL_INCLUDES="${CORE_IDL_INCLUDES} -I${dir}" ! done AC_SUBST(CORE_IDL_INCLUDES) dnl typical components *************** *** 298,303 **** --- 314,343 ---- -DGTK_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED" + dnl AIX specific: find commands that retrieve system infomation + + AH_TEMPLATE(LIST_DISK_CMD, [Command to list all disks on system]) + AH_TEMPLATE(LIST_CDROM_CMD, [Command to list all cdroms on system]) + AH_TEMPLATE(GET_SIZE_CMD, [Command to get size of a disk]) + AH_TEMPLATE(GET_CPU_HZ_CMD, [Command to get frequency of cpu]) + + case $host_os in + aix*) + AC_PATH_PROG(LSDEV_PATH, lsdev) + if test x"$LSDEV_PATH" != "x" + then + AC_DEFINE_UNQUOTED(LIST_DISK_CMD, "$LSDEV_PATH -C -c disk -F \\\"name|class|status|location|description\\\"") + AC_DEFINE_UNQUOTED(LIST_CDROM_CMD, "$LSDEV_PATH -C -c cdrom -F \\\"name|class|status|location|description\\\"") + fi + AC_PATH_PROG(LSATTR_PATH, lsattr) + if test x"$LSATTR_PATH" != "x" + then + AC_DEFINE_UNQUOTED(GET_SIZE_CMD, "$LSATTR_PATH -E -l %s -F value -a size_in_mb") + AC_DEFINE_UNQUOTED(GET_CPU_HZ_CMD, "$LSATTR_PATH -E -l proc%d -F value -a frequency") + fi + ;; + esac + dnl FIXME: put this back once the registration_id stuff is cleared up. dnl -DBONOBO_DISABLE_DEPRECATED *************** *** 306,318 **** dnl dnl disable (broken) hardware view dnl hw_view=disabled AC_ARG_ENABLE(hardware, ! [ --enable-hardware Enable (broken, Linux only) hardware view], ! hw_view=enabled) ! if test "x`(uname -s) 2>/dev/null`" != "xLinux"; then ! hw_view=disabled ! fi AM_CONDITIONAL(ENABLE_HARDWARE_VIEW, test "$hw_view" = "enabled") --- 346,384 ---- dnl dnl disable (broken) hardware view dnl + hw_view=disabled AC_ARG_ENABLE(hardware, ! [ --enable-hardware Enable (broken, Linux/AIX only) hardware view], ! [ ! case $host_os in ! linux*) ! hw_view=enabled ! ;; ! aix*) ! dnl AIX uses libgtop to enable hardware view ! ! LIBGTOP_REQUIRED=2.0.0 ! ! AH_TEMPLATE([HAVE_LIBGTOP], [Define to 1 if libgtop is available]) ! ! PKG_CHECK_MODULES(LIBGTOP, libgtop-2.0 >= $LIBGTOP_REQUIRED, have_libgtop=yes, have_libtop=no) ! if test "x$have_libgtop" = "xyes"; then ! AC_DEFINE(HAVE_LIBGTOP,1) ! AC_SUBST(LIBGTOP_CFLAGS) ! AC_SUBST(LIBGTOP_LIBS) ! hw_view=enabled ! else ! AC_MSG_WARN([Hardware view disabled, AIX needs libgtop >= $LIBGTOP_REQUIRED]) ! hw_view=disabled ! fi ! ;; ! *) ! AC_MSG_WARN([Hardware view disabled, available only for linux and AIX]) ! hw_view=disabled ! ;; ! esac]) ! AM_CONDITIONAL(ENABLE_HARDWARE_VIEW, test "$hw_view" = "enabled") diff -crN ./nautilus/cut-n-paste-code/libegg/egg-recent-item.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/libegg/egg-recent-item.c *** ./nautilus/cut-n-paste-code/libegg/egg-recent-item.c Wed Nov 6 11:39:04 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/libegg/egg-recent-item.c Thu Sep 4 17:45:51 2003 *************** *** 64,73 **** g_free (item); } ! void egg_recent_item_ref (EggRecentItem *item) { item->refcount++; } void --- 64,75 ---- g_free (item); } ! gpointer egg_recent_item_ref (EggRecentItem *item) { item->refcount++; + + return item; } void diff -crN ./nautilus/cut-n-paste-code/libegg/egg-recent-item.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/libegg/egg-recent-item.h *** ./nautilus/cut-n-paste-code/libegg/egg-recent-item.h Wed Nov 6 11:39:04 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/cut-n-paste-code/libegg/egg-recent-item.h Thu Sep 4 17:45:52 2003 *************** *** 34,40 **** /* constructors */ EggRecentItem * egg_recent_item_new (void); ! void egg_recent_item_ref (EggRecentItem *item); void egg_recent_item_unref (EggRecentItem *item); /* automatically fetches the mime type, etc */ --- 34,40 ---- /* constructors */ EggRecentItem * egg_recent_item_new (void); ! gpointer egg_recent_item_ref (EggRecentItem *item); void egg_recent_item_unref (EggRecentItem *item); /* automatically fetches the mime type, etc */ diff -crN ./nautilus/data/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/data/Makefile.am *** ./nautilus/data/Makefile.am Thu Oct 10 15:18:14 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/data/Makefile.am Wed Jul 9 19:16:37 2003 *************** *** 26,33 **** serverconfig.desktop \ $(NULL) - DESKTOP_FILES=$(DESKTOP_IN_FILES:.in=) - nautilusdatadir = $(datadir)/nautilus nautilusdata_DATA = \ --- 26,31 ---- diff -crN ./nautilus/libnautilus-adapter/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-adapter/Makefile.am *** ./nautilus/libnautilus-adapter/Makefile.am Sun Mar 3 23:54:14 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-adapter/Makefile.am Wed Jul 9 19:17:23 2003 *************** *** 12,17 **** --- 12,19 ---- -version-info 2:0:0 \ $(NULL) + libnautilus_adapter_la_LIBADD= @ALL_LIBS@ ../libnautilus/libnautilus.la + nautilus_adapter_factory_idl_sources = \ nautilus-adapter-factory-stubs.c \ nautilus-adapter-factory-skels.c \ diff -crN ./nautilus/libnautilus-private/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/Makefile.am *** ./nautilus/libnautilus-private/Makefile.am Wed Nov 6 11:54:17 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/Makefile.am Wed Jul 9 15:18:59 2003 *************** *** 2,7 **** --- 2,9 ---- lib_LTLIBRARIES=libnautilus-private.la + libnautilus_private_la_LIBADD = ../libnautilus/libnautilus.la + INCLUDES = \ -I$(top_srcdir) \ -I$(top_builddir) \ diff -crN ./nautilus/libnautilus-private/nautilus-file-private.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-file-private.h *** ./nautilus/libnautilus-private/nautilus-file-private.h Tue Feb 11 09:19:00 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-file-private.h Wed Jul 9 15:19:23 2003 *************** *** 111,117 **** eel_boolean_bit directory_count_failed : 1; eel_boolean_bit directory_count_is_up_to_date : 1; ! NautilusRequestStatus deep_counts_status : 2; /* no deep_counts_are_up_to_date field; since we expose intermediate values for this attribute, we do actually forget it rather than invalidating. */ --- 111,117 ---- eel_boolean_bit directory_count_failed : 1; eel_boolean_bit directory_count_is_up_to_date : 1; ! int deep_counts_status : 2; /* NautilusRequestStatus */ /* no deep_counts_are_up_to_date field; since we expose intermediate values for this attribute, we do actually forget it rather than invalidating. */ diff -crN ./nautilus/libnautilus-private/nautilus-icon-canvas-item.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-icon-canvas-item.c *** ./nautilus/libnautilus-private/nautilus-icon-canvas-item.c Thu Mar 6 16:03:04 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-icon-canvas-item.c Wed Jul 9 15:20:29 2003 *************** *** 23,28 **** --- 23,29 ---- */ #include + #include #include "nautilus-icon-canvas-item.h" #include "nautilus-file-utilities.h" *************** *** 51,57 **** #include #include #include - #include #include #include --- 52,57 ---- *************** *** 118,124 **** PROP_ADDITIONAL_TEXT, PROP_HIGHLIGHTED_FOR_SELECTION, PROP_HIGHLIGHTED_AS_KEYBOARD_FOCUS, ! PROP_HIGHLIGHTED_FOR_DROP, }; typedef enum { --- 118,124 ---- PROP_ADDITIONAL_TEXT, PROP_HIGHLIGHTED_FOR_SELECTION, PROP_HIGHLIGHTED_AS_KEYBOARD_FOCUS, ! PROP_HIGHLIGHTED_FOR_DROP }; typedef enum { diff -crN ./nautilus/libnautilus-private/nautilus-icon-container.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-icon-container.c *** ./nautilus/libnautilus-private/nautilus-icon-container.c Mon Mar 10 12:06:59 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-icon-container.c Wed Jul 9 16:34:34 2003 *************** *** 25,30 **** --- 25,31 ---- */ #include + #include #include "nautilus-icon-container.h" #include "nautilus-global-preferences.h" *************** *** 49,55 **** #include #include #include - #include #include #include --- 50,55 ---- diff -crN ./nautilus/libnautilus-private/nautilus-icon-dnd.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-icon-dnd.c *** ./nautilus/libnautilus-private/nautilus-icon-dnd.c Thu Mar 6 15:42:25 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-icon-dnd.c Wed Jul 9 15:19:58 2003 *************** *** 28,33 **** --- 28,34 ---- #include + #include #include "nautilus-icon-dnd.h" #include "nautilus-file-dnd.h" *************** *** 56,62 **** #include #include #include - #include #include #include --- 57,62 ---- diff -crN ./nautilus/libnautilus-private/nautilus-program-chooser.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-program-chooser.c *** ./nautilus/libnautilus-private/nautilus-program-chooser.c Fri Nov 8 10:10:40 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-program-chooser.c Wed Jul 9 16:35:02 2003 *************** *** 75,81 **** PROGRAM_IN_PREFERRED_LIST_FOR_FILE, PROGRAM_DEFAULT_FOR_SUPERTYPE, PROGRAM_DEFAULT_FOR_TYPE, ! PROGRAM_DEFAULT_FOR_FILE, } ProgramFileStatus; typedef struct { --- 75,81 ---- PROGRAM_IN_PREFERRED_LIST_FOR_FILE, PROGRAM_DEFAULT_FOR_SUPERTYPE, PROGRAM_DEFAULT_FOR_TYPE, ! PROGRAM_DEFAULT_FOR_FILE } ProgramFileStatus; typedef struct { diff -crN ./nautilus/libnautilus-private/nautilus-volume-monitor.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-volume-monitor.c *** ./nautilus/libnautilus-private/nautilus-volume-monitor.c Fri Feb 28 15:52:23 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-volume-monitor.c Wed Jul 9 16:35:39 2003 *************** *** 65,77 **** --- 65,94 ---- #include #endif + #if defined(HAVE_SYS_MNTCTL_H) && defined(HAVE_SYS_VMOUNT_H) && defined(HAVE_SYS_VFS_H) && !defined(HAVE_MNTENT_H) + + #include + #include + #include + #include + + #define AIX_MNT 1 + + #endif /* HAVE_SYS_MNTCTL_H && HAVE_SYS_VMOUNT_H && HAVE_SYS_VFS_H*/ + #ifdef HAVE_MNTENT_H #include + #ifdef _PATH_MNTTAB #define MOUNT_TABLE_PATH _PATH_MNTTAB + #else + #define MOUNT_TABLE_PATH MNTTAB + #endif #elif defined (HAVE_SYS_MNTTAB_H) #define SOLARIS_MNT 1 #include #define MOUNT_TABLE_PATH "/etc/mnttab" + #elif defined (AIX_MNT) + #define MOUNT_TABLE_PATH "/etc/filesystems" #else /* FIXME: How does this help anything? */ #define MOUNT_TABLE_PATH "" *************** *** 142,147 **** --- 159,171 ---- #elif defined (HAVE_GETMNTINFO) typedef struct statfs MountTableEntry; #define MOUNT_TABLE_ENTRY_TYPE(ent) ((ent)->f_fstypename) + #elif defined(AIX_MNT) + typedef struct { + char mnt_mount[PATH_MAX]; + char mnt_special[PATH_MAX]; + char mnt_fstype[16]; + char mnt_options[128]; + } MountTableEntry; #else typedef struct mntent MountTableEntry; #define MOUNT_TABLE_ENTRY_TYPE(ent) ((ent)->mnt_type) *************** *** 507,518 **** return TRUE; } #endif ! return FALSE; } #endif /* get_removable_volumes * * Returns a list a device paths. --- 531,670 ---- return TRUE; } #endif ! return FALSE; } #endif + #if defined(AIX_MNT) + + /* + * functions to parse /etc/filesystems + * + */ + + /* aix_fsprop_getc + * + * read character, ignoring comments (begin with '*', end with '\n' + */ + + static int aix_fs_getc(FILE* fd) + { + int c; + + while ((c = getc(fd)) == '*') + { + while (((c = getc(fd)) != '\n') && (c != EOF)); + } + } + + /* aix_fs_ignorespace + * + * eat all continuous spaces in a file + * + */ + + static int aix_fs_ignorespace(FILE* fd) + { + int c; + + while ((c = aix_fs_getc(fd)) != EOF) + { + if (!isspace(c)) + { + ungetc(c,fd); + return c; + } + } + + return EOF; + } + + /* aix_fs_getword + * + * read one word from file + */ + + static int aix_fs_getword(FILE* fd, char* word) + { + int c; + + aix_fs_ignorespace(fd); + + while (((c = aix_fs_getc(fd)) != EOF) && !isspace(c)) + { + if (c == '"') + { + while (((c = aix_fs_getc(fd)) != EOF) && (c != '"')) + *word++ = c; + } + else + *word++ = c; + } + *word = 0; + + return c; + } + + /* aix_fs_get + * + * read mount points properties + */ + + static int aix_fs_get(FILE* fd, MountTableEntry* prop) + { + static char word[PATH_MAX] = { 0 }; + char value[PATH_MAX]; + + /* read stanza */ + + if (word[0] == 0) + { + if (aix_fs_getword(fd, word) == EOF) + return EOF; + } + + word[strlen(word) - 1] = 0; + strcpy(prop->mnt_mount, word); + + /* read attributes and value */ + + while(aix_fs_getword(fd, word) != EOF) + { + /* test if is attribute or new stanza */ + + if (word[strlen(word) - 1] == ':') + { + return 0; + } + + /* read "=" */ + + aix_fs_getword(fd, value); + + /* read value */ + + aix_fs_getword(fd, value); + + if (strcmp(word, "dev") == 0) + { + strcpy(prop->mnt_special, value); + } + else if (strcmp(word, "vfs") == 0) + { + strcpy(prop->mnt_fstype, value); + } + else if (strcmp(word, "options") == 0) + { + strcpy(prop->mnt_options, value); + } + } + + return 0; + } + #endif + /* get_removable_volumes * * Returns a list a device paths. *************** *** 527,533 **** MountTableEntry *ent; NautilusVolume *volume; char * fs_opt; ! #ifdef HAVE_SYS_MNTTAB_H MountTableEntry ent_storage; #endif #ifdef HAVE_GETMNTINFO --- 679,685 ---- MountTableEntry *ent; NautilusVolume *volume; char * fs_opt; ! #if defined(HAVE_SYS_MNTTAB_H) || defined(AIX_MNT) MountTableEntry ent_storage; #endif #ifdef HAVE_GETMNTINFO *************** *** 556,562 **** return NULL; } ! #ifdef HAVE_SYS_MNTTAB_H ent = &ent_storage; while (! getmntent (file, ent)) { if (eel_str_has_prefix (ent->mnt_special, noauto_string)) { --- 708,726 ---- return NULL; } ! #if defined(AIX_MNT) ! ent = &ent_storage; ! while(!aix_fs_get(file, ent)) ! { ! if (strcmp("cdrfs", ent->mnt_fstype) == 0) ! { ! volume = create_volume (ent->mnt_special, ent->mnt_mount); ! volume->is_removable = TRUE; ! volumes = finish_creating_volume_and_prepend ! (monitor, volume, ent->mnt_fstype, volumes); ! } ! } ! #elif defined(HAVE_SYS_MNTTAB_H) ent = &ent_storage; while (! getmntent (file, ent)) { if (eel_str_has_prefix (ent->mnt_special, noauto_string)) { *************** *** 619,625 **** return result; } ! #ifndef SOLARIS_MNT static gboolean volume_is_removable (const NautilusVolume *volume) --- 783,789 ---- return result; } ! #if !defined(SOLARIS_MNT) static gboolean volume_is_removable (const NautilusVolume *volume) *************** *** 962,969 **** } ! #ifdef SOLARIS_MNT static GList * get_mount_list (NautilusVolumeMonitor *monitor) --- 1126,1220 ---- } + #ifdef AIX_MNT ! static GList * ! get_mount_list (NautilusVolumeMonitor *monitor) ! { ! struct vfs_ent *fs_info; ! struct vmount *vmount_info, *current_vmount; ! int vmount_number; ! unsigned int vmount_size; ! int current; ! char *device; ! char *mount; ! char* fstype; ! int is_removable; ! int is_readonly; ! ! NautilusVolume *volume; ! GList *volumes = NULL; ! ! if (mntctl(MCTL_QUERY, sizeof(vmount_size), &vmount_size) != 0) ! { ! g_warning("Unable to know the number of mounted volumes\n"); ! ! return NULL; ! } ! ! vmount_info = (struct vmount*)malloc(vmount_size); ! if (vmount_info == NULL) ! { ! g_warning("Unable to allocate memory\n"); ! return NULL; ! } ! ! vmount_number = mntctl(MCTL_QUERY, vmount_size, vmount_info); ! ! if (vmount_info->vmt_revision != VMT_REVISION) ! { ! g_warning("Bad vmount structure revision number, want %d, got %d\n", VMT_REVISION, vmount_info->vmt_revision); ! } ! ! if (vmount_number < 0) ! { ! g_warning("Unable to recover mounted volumes information\n"); ! ! free(vmount_info); ! ! return NULL; ! } ! ! current_vmount = vmount_info; ! while (vmount_number > 0) ! { ! device = vmt2dataptr(current_vmount, VMT_OBJECT); ! mount = vmt2dataptr(current_vmount, VMT_STUB); ! is_removable = (current_vmount->vmt_flags & MNT_REMOVABLE) ? 1 : 0; ! is_readonly = (current_vmount->vmt_flags & MNT_READONLY) ? 1 : 0; ! ! fs_info = getvfsbytype(current_vmount->vmt_gfstype); ! ! if (fs_info == NULL) ! { ! g_warning("Unknown FS type !\n"); ! fstype = "???"; ! } ! else ! { ! fstype = fs_info->vfsent_name; ! } ! ! volume = create_volume(device, mount); ! volume->is_removable = is_removable; ! volume->is_read_only = is_readonly; ! ! volumes = finish_creating_volume_and_prepend ! (monitor, volume, fstype, volumes); ! ! /* next entry */ ! ! current_vmount = (struct vmount *)( (char*)current_vmount ! + current_vmount->vmt_length); ! vmount_number--; ! } ! ! free(vmount_info); ! ! return volumes; ! } ! ! #elif SOLARIS_MNT static GList * get_mount_list (NautilusVolumeMonitor *monitor) *************** *** 992,998 **** return volumes; } ! #else /* !SOLARIS_MNT */ static gboolean option_list_has_option (const char *optlist, --- 1243,1249 ---- return volumes; } ! #else /* !AIX_MNT && !SOLARIS_MNT */ static gboolean option_list_has_option (const char *optlist, *************** *** 1214,1223 **** static int get_cdrom_type (const char *vol_dev_path, int* fd) { ! #ifndef SOLARIS_MNT ! *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); ! return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT); ! #else GString *new_dev_path; struct cdrom_tocentry entry; struct cdrom_tochdr header; --- 1465,1471 ---- static int get_cdrom_type (const char *vol_dev_path, int* fd) { ! #ifdef SOLARIS_MNT GString *new_dev_path; struct cdrom_tocentry entry; struct cdrom_tochdr header; *************** *** 1254,1259 **** --- 1502,1512 ---- } return type; + #elif defined(AIX_MNT) + return CDS_NO_INFO; + #else + *fd = open (vol_dev_path, O_RDONLY|O_NONBLOCK); + return ioctl (*fd, CDROM_DISC_STATUS, CDSL_CURRENT); #endif } *************** *** 1768,1775 **** for (node = volume_list; node != NULL; node = node->next) { volume = node->data; ! #ifndef SOLARIS_MNT ! /* These are set up by get_current_mount_list for Solaris. */ volume->is_removable = volume_is_removable (volume); #endif if (volume->volume_name == NULL) { --- 2021,2028 ---- for (node = volume_list; node != NULL; node = node->next) { volume = node->data; ! #if !defined(SOLARIS_MNT) && !defined(AIX_MNT) ! /* These are set up by get_current_mount_list for Solaris&AIX.*/ volume->is_removable = volume_is_removable (volume); #endif if (volume->volume_name == NULL) { diff -crN ./nautilus/libnautilus-private/nautilus-volume-monitor.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-volume-monitor.h *** ./nautilus/libnautilus-private/nautilus-volume-monitor.h Tue Feb 4 10:35:02 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus-private/nautilus-volume-monitor.h Wed Jul 9 16:35:53 2003 *************** *** 69,75 **** NAUTILUS_DEVICE_ZIP_DRIVE, NAUTILUS_DEVICE_SMB, NAUTILUS_DEVICE_APPLE, ! NAUTILUS_DEVICE_WINDOWS, } NautilusDeviceType; typedef gboolean (* NautilusEachVolumeCallback) (const NautilusVolume *, gpointer callback_data); --- 69,75 ---- NAUTILUS_DEVICE_ZIP_DRIVE, NAUTILUS_DEVICE_SMB, NAUTILUS_DEVICE_APPLE, ! NAUTILUS_DEVICE_WINDOWS } NautilusDeviceType; typedef gboolean (* NautilusEachVolumeCallback) (const NautilusVolume *, gpointer callback_data); diff -crN ./nautilus/libnautilus/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus/Makefile.am *** ./nautilus/libnautilus/Makefile.am Fri Mar 7 16:42:00 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/libnautilus/Makefile.am Wed Jul 9 15:16:17 2003 *************** *** 14,19 **** --- 14,21 ---- -version-info 2:0:0 \ $(NULL) + libnautilus_la_LIBADD = @ALL_LIBS@ + nautilus_view_component_idl_sources = \ nautilus-view-component-stubs.c \ nautilus-view-component-skels.c \ diff -crN ./nautilus/src/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/Makefile.am *** ./nautilus/src/Makefile.am Wed Nov 6 11:54:23 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/Makefile.am Wed Jul 9 16:36:52 2003 *************** *** 35,40 **** --- 35,41 ---- $(top_builddir)/libnautilus-adapter/libnautilus-adapter.la \ $(top_builddir)/libnautilus-private/libnautilus-private.la \ $(CORE_LIBS) \ + $(POPT_LIBS) \ $(NULL) @INTLTOOL_DESKTOP_RULE@ diff -crN ./nautilus/src/file-manager/fm-directory-view.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/file-manager/fm-directory-view.c *** ./nautilus/src/file-manager/fm-directory-view.c Thu Mar 6 15:42:25 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/file-manager/fm-directory-view.c Wed Jul 9 19:03:33 2003 *************** *** 28,33 **** --- 28,34 ---- */ #include + #include #include "fm-directory-view.h" #include "fm-error-reporting.h" *************** *** 82,88 **** #include #include #include - #include #include /* The list view receives files from the directory model in chunks, to --- 83,88 ---- diff -crN ./nautilus/src/nautilus-applicable-views.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/nautilus-applicable-views.h *** ./nautilus/src/nautilus-applicable-views.h Thu Dec 12 09:22:37 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/nautilus-applicable-views.h Wed Jul 9 16:37:48 2003 *************** *** 54,60 **** NAUTILUS_DETERMINE_VIEW_ACCESS_DENIED, NAUTILUS_DETERMINE_VIEW_HOST_NOT_FOUND, NAUTILUS_DETERMINE_VIEW_HOST_HAS_NO_ADDRESS, ! NAUTILUS_DETERMINE_VIEW_NO_MASTER_BROWSER, } NautilusDetermineViewResult; typedef void (* NautilusDetermineViewCallback) (NautilusDetermineViewHandle *handle, --- 54,60 ---- NAUTILUS_DETERMINE_VIEW_ACCESS_DENIED, NAUTILUS_DETERMINE_VIEW_HOST_NOT_FOUND, NAUTILUS_DETERMINE_VIEW_HOST_HAS_NO_ADDRESS, ! NAUTILUS_DETERMINE_VIEW_NO_MASTER_BROWSER } NautilusDetermineViewResult; typedef void (* NautilusDetermineViewCallback) (NautilusDetermineViewHandle *handle, diff -crN ./nautilus/src/nautilus-information-panel.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/nautilus-information-panel.c *** ./nautilus/src/nautilus-information-panel.c Mon Feb 10 10:40:47 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/nautilus-information-panel.c Wed Jul 9 16:38:09 2003 *************** *** 144,150 **** typedef enum { NO_PART, BACKGROUND_PART, ! ICON_PART, } InformationPanelPart; EEL_CLASS_BOILERPLATE (NautilusInformationPanel, nautilus_information_panel, EEL_TYPE_BACKGROUND_BOX) --- 144,150 ---- typedef enum { NO_PART, BACKGROUND_PART, ! ICON_PART } InformationPanelPart; EEL_CLASS_BOILERPLATE (NautilusInformationPanel, nautilus_information_panel, EEL_TYPE_BACKGROUND_BOX) diff -crN ./nautilus/src/nautilus-property-browser.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/nautilus-property-browser.c *** ./nautilus/src/nautilus-property-browser.c Tue Mar 4 14:57:01 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/nautilus-property-browser.c Wed Jul 9 17:08:03 2003 *************** *** 29,34 **** --- 29,35 ---- */ #include + #include #include "nautilus-property-browser.h" #include "nautilus-signaller.h" *************** *** 85,91 **** #include #include #include - #include #include /* property types */ --- 86,91 ---- *************** *** 210,216 **** #define ERASE_OBJECT_NAME "erase.png" enum { ! PROPERTY_TYPE, }; static GtkTargetEntry drag_types[] = { --- 210,216 ---- #define ERASE_OBJECT_NAME "erase.png" enum { ! PROPERTY_TYPE }; static GtkTargetEntry drag_types[] = { diff -crN ./nautilus/src/nautilus-server-connect.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/nautilus-server-connect.c *** ./nautilus/src/nautilus-server-connect.c Thu Feb 20 15:08:04 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/nautilus-server-connect.c Wed Jul 9 17:09:23 2003 *************** *** 30,36 **** #undef DEBUG #ifdef DEBUG ! #define D(x) g_message x #else #define D(x) #endif --- 30,36 ---- #undef DEBUG #ifdef DEBUG ! #define D(x) x #else #define D(x) #endif *************** *** 74,80 **** while (result == GNOME_VFS_ERROR_NOT_FOUND) { parent = gnome_vfs_uri_get_parent (work_uri); ! D(("trying to create: %s", gnome_vfs_uri_to_string (parent, 0))); result = gnome_vfs_make_directory_for_uri (parent, perm); if (result == GNOME_VFS_ERROR_NOT_FOUND) --- 74,80 ---- while (result == GNOME_VFS_ERROR_NOT_FOUND) { parent = gnome_vfs_uri_get_parent (work_uri); ! D(g_message("trying to create: %s", gnome_vfs_uri_to_string (parent, 0))); result = gnome_vfs_make_directory_for_uri (parent, perm); if (result == GNOME_VFS_ERROR_NOT_FOUND) *************** *** 91,97 **** } while (result == GNOME_VFS_OK && list != NULL) { ! D(("creating: %s", gnome_vfs_uri_to_string (list->data, 0))); result = gnome_vfs_make_directory_for_uri ((GnomeVFSURI *) list->data, perm); --- 91,97 ---- } while (result == GNOME_VFS_OK && list != NULL) { ! D(g_message("creating: %s", gnome_vfs_uri_to_string (list->data, 0))); result = gnome_vfs_make_directory_for_uri ((GnomeVFSURI *) list->data, perm); *************** *** 109,115 **** GnomeVFSURI *uri; GnomeVFSResult result; ! D(("gnome_vfs_make_directory_with_parents (%s)", text_uri)); uri = gnome_vfs_uri_new (text_uri); result = gnome_vfs_make_directory_with_parents_for_uri (uri, perm); D(("gnome_vfs_make_directory_with_parents: %s\n", --- 109,115 ---- GnomeVFSURI *uri; GnomeVFSResult result; ! D(g_message("gnome_vfs_make_directory_with_parents (%s)", text_uri)); uri = gnome_vfs_uri_new (text_uri); result = gnome_vfs_make_directory_with_parents_for_uri (uri, perm); D(("gnome_vfs_make_directory_with_parents: %s\n", diff -crN ./nautilus/src/nautilus-sidebar-title.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/nautilus-sidebar-title.c *** ./nautilus/src/nautilus-sidebar-title.c Thu Mar 6 15:42:25 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/src/nautilus-sidebar-title.c Wed Jul 9 17:08:52 2003 *************** *** 25,30 **** --- 25,31 ---- /* This is the sidebar title widget, which is the title part of the sidebar. */ #include + #include #include "nautilus-sidebar-title.h" #include "nautilus-window.h" *************** *** 53,59 **** #include #include #include - #include #include #include --- 54,59 ---- diff -crN ./nautilus/test/test-nautilus-preferences-change.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/test/test-nautilus-preferences-change.c *** ./nautilus/test/test-nautilus-preferences-change.c Thu Mar 7 22:42:08 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/test/test-nautilus-preferences-change.c Wed Jul 9 19:04:00 2003 *************** *** 85,91 **** eel_preferences_set_emergency_fallback_integer ("fruits/orange", 2); eel_preferences_set_emergency_fallback_integer ("fruits/pear", 3); ! //sleep (10); window = test_window_new (NULL, 4); test_window_set_title_with_pid (GTK_WINDOW (window), "Preferences Change"); --- 85,91 ---- eel_preferences_set_emergency_fallback_integer ("fruits/orange", 2); eel_preferences_set_emergency_fallback_integer ("fruits/pear", 3); ! /*sleep (10); */ window = test_window_new (NULL, 4); test_window_set_title_with_pid (GTK_WINDOW (window), "Preferences Change"); diff -crN ./nautilus/test/test.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/test/test.c *** ./nautilus/test/test.c Wed Nov 6 11:54:27 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./nautilus/test/test.c Wed Jul 9 19:04:25 2003 *************** *** 16,22 **** int test_quit (int exit_code) { ! //gnome_vfs_shutdown (); if (gtk_main_level () > 0) { gtk_main_quit (); --- 16,22 ---- int test_quit (int exit_code) { ! /*gnome_vfs_shutdown ();*/ if (gtk_main_level () > 0) { gtk_main_quit ();