gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-08-25 02:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove HAVE_POPT_H define since the bug in OAF that we were working around

Browse source 
* libnautilus-extensions/nautilus-view-identifier.h: Remove
	HAVE_POPT_H define since the bug in OAF that we were working
	around has been fixed.

	* components/music/nautilus-music-view.c: Remove unneeded
	includes.

	* components/rpmview/nautilus-rpm-view.c: Remove unused
	#define and FIXME for bug already fixed.
	* components/tree/nautilus-tree-view.c:
	(nautilus_tree_view_destroy): Remove FIXME for bug already fixed.
	* libnautilus-extensions/nautilus-global-preferences.c: Remove
	FIXME for bug already fixed.
	* libnautilus-extensions/nautilus-user-level-manager.c: Remove
	FIXME for bug already fixed.
	* src/file-manager/fm-list-view.c: (fm_list_get_default_action):
	Remove FIXME for bug already fixed.
	* src/nautilus-property-browser.c: (add_background_to_browser):
	Remove FIXME for bug already fixed.
	* src/nautilus-window.h: Remove FIXME for bug already fixed.

	* tools/README: Remove file now that people have had a chance to
	find the tools in their new location, so the directory will go
	away.
This commit is contained in:
Darin Adler 2000-11-29 00:24:32 +00:00
parent 178e9bd9d3
commit c6beacef99
18 changed files with 54 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ChangeLog
View file

@ -1,3 +1,32 @@
2000-11-28 Darin Adler <darin@eazel.com>
reviewed by: Pavel Cisler <pavel@eazel.com>
* libnautilus-extensions/nautilus-view-identifier.h: Remove
HAVE_POPT_H define since the bug in OAF that we were working
around has been fixed.
* components/music/nautilus-music-view.c: Remove unneeded
includes.
* components/rpmview/nautilus-rpm-view.c: Remove unused
#define and FIXME for bug already fixed.
* components/tree/nautilus-tree-view.c:
(nautilus_tree_view_destroy): Remove FIXME for bug already fixed.
* libnautilus-extensions/nautilus-global-preferences.c: Remove
FIXME for bug already fixed.
* libnautilus-extensions/nautilus-user-level-manager.c: Remove
FIXME for bug already fixed.
* src/file-manager/fm-list-view.c: (fm_list_get_default_action):
Remove FIXME for bug already fixed.
* src/nautilus-property-browser.c: (add_background_to_browser):
Remove FIXME for bug already fixed.
* src/nautilus-window.h: Remove FIXME for bug already fixed.
* tools/README: Remove file now that people have had a chance to
find the tools in their new location, so the directory will go
away.
2000-11-28 John Sullivan <sullivan@eazel.com>
reviewed by: Pavel Cisler <pavel@eazel.com>
@ -84,7 +113,6 @@
Fixed the white point problem on a few PNG files.
I don't think this got them all.
2000-11-28 J Shane Culpepper <pepper@eazel.com>
* components/services/trilobite/libtrilobite/Makefile.am:
@ -303,7 +331,6 @@
Turned out to be easy - the nautilus_file_contains_text was
over-optimistic. Changed it to only mark for preview actual text files
(files with the "text" MIME supertype).
2000-11-27 Andy Hertzfeld <andy@eazel.com>

2
check-FIXME.pl
View file

@ -59,7 +59,7 @@ chomp $product;
close FILE;
print "Searching the bugzilla database's product $product for open fixme bugs\n";
print "Searching the bugzilla database's product $product for open FIXME bugs\n";
if (!grep /$product/, ( "nautilus", "gnome-vfs", "medusa", "oaf")) {
print "Can't find your product in the bugzilla.eazel.com database\n";

44
components/music/nautilus-music-view.c
View file

@ -26,47 +26,39 @@
#include <config.h>
#include "nautilus-music-view.h"
#include "mpg123_handler.h"
#include "mp3head.h"
#include "mpg123_handler.h"
#include "pixmaps.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <dirent.h>
#include <ctype.h>
#include <esd.h>
#include <libnautilus/libnautilus.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gnome.h>
#include <gtk/gtksignal.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnorba/gnorba.h>
#include <libnautilus-extensions/nautilus-background.h>
#include <libnautilus-extensions/nautilus-directory-background.h>
#include <libnautilus-extensions/nautilus-directory-notify.h>
#include <libnautilus-extensions/nautilus-file-attributes.h>
#include <libnautilus-extensions/nautilus-file-utilities.h>
#include <libnautilus-extensions/nautilus-file.h>
#include <libnautilus-extensions/nautilus-font-factory.h>
#include <libnautilus-extensions/nautilus-gdk-extensions.h>
#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
#include <libnautilus-extensions/nautilus-glib-extensions.h>
#include <libnautilus-extensions/nautilus-gtk-extensions.h>
#include <libnautilus-extensions/nautilus-gtk-macros.h>
#include <libnautilus-extensions/nautilus-label.h>
#include <libnautilus-extensions/nautilus-label.h>
#include <libnautilus-extensions/nautilus-metadata.h>
#include <libnautilus-extensions/nautilus-scalable-font.h>
#include <libnautilus-extensions/nautilus-sound.h>
#include <libnautilus-extensions/nautilus-stock-dialogs.h>
#include <libnautilus-extensions/nautilus-string.h>
#include <libnautilus-extensions/nautilus-font-factory.h>
#include <libnautilus-extensions/nautilus-string.h>
#include <libnautilus-extensions/nautilus-label.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtksignal.h>
#include <gnome.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnorba/gnorba.h>
#include <libnautilus/libnautilus.h>
#include <limits.h>
#include <sys/types.h>
struct _NautilusMusicViewDetails {
NautilusFile *file;
@ -597,7 +589,7 @@ read_id_tag (const char *song_uri, SongInfo *song_info)
char tag_buffer[129];
char temp_str[31];
result = gnome_vfs_open(&mp3_file, song_uri, GNOME_VFS_OPEN_READ);
result = gnome_vfs_open (&mp3_file, song_uri, GNOME_VFS_OPEN_READ);
if (result != GNOME_VFS_OK) {
return FALSE;
}
@ -733,16 +725,16 @@ fetch_song_info (const char *song_uri, GnomeVFSFileInfo *file_info, int file_ord
info->title = g_strdup (file_info->name);
}
result = gnome_vfs_open(&mp3_file, song_uri, GNOME_VFS_OPEN_READ);
result = gnome_vfs_open (&mp3_file, song_uri, GNOME_VFS_OPEN_READ);
if (result == GNOME_VFS_OK) {
result = gnome_vfs_read(mp3_file, buffer, sizeof(buffer), &length_read);
result = gnome_vfs_read (mp3_file, buffer, sizeof(buffer), &length_read);
if ((result == GNOME_VFS_OK) && (length_read > 512)) {
info->bitrate = get_bitrate (buffer,length_read);
info->samprate = get_samprate (buffer,length_read);
info->stereo = get_stereo (buffer,length_read);
info->track_time = fetch_play_time (file_info, info->bitrate);
}
gnome_vfs_close(mp3_file);
gnome_vfs_close (mp3_file);
}
return info;
@ -987,7 +979,7 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
if (song_uri == NULL) {
return;
}
song_filename = gnome_vfs_get_local_path_from_uri(song_uri);
song_filename = gnome_vfs_get_local_path_from_uri (song_uri);
/* for now, we can only play local files, so apologize to the user and give up */
if (song_filename == NULL) {
@ -1531,8 +1523,8 @@ nautilus_music_view_update (NautilusMusicView *music_view)
escaped_name = gnome_vfs_escape_string (current_file_info->name);
path_uri = nautilus_make_path (uri, escaped_name);
g_free(escaped_name);
g_free (escaped_name);
/* fetch info and queue it if it's an mp3 file */
info = fetch_song_info (path_uri, current_file_info, file_index);
if (info) {
@ -1627,7 +1619,7 @@ nautilus_music_view_update (NautilusMusicView *music_view)
album_name = determine_attribute (song_list, FALSE);
if (album_name == NULL) {
album_name = g_strdup (gnome_vfs_unescape_string_for_display(g_basename (uri)));
album_name = g_strdup (gnome_vfs_unescape_string_for_display (g_basename (uri)));
}
artist_name = determine_attribute (song_list, TRUE);

7
components/rpmview/nautilus-rpm-view.c
View file

@ -73,13 +73,6 @@ enum {
TARGET_GNOME_URI_LIST
};
/* FIXME: bugzilla.eazel.com 2674
Once nautilus label has beeen fixed, remove this define.
Don't forgot to fix the places its used, so
the description and summary are in gtk_label_new */
#define LONG_FIELDS_IN_GTK_LABEL
static GtkTargetEntry rpm_dnd_target_table[] = {
{ "text/uri-list", 0, TARGET_URI_LIST },
{ "application/x-color", 0, TARGET_COLOR },

1
components/tree/nautilus-tree-view.c
View file

@ -718,7 +718,6 @@ nautilus_tree_view_destroy (GtkObject *object)
}
nautilus_drag_finalize (view->details->dnd->drag_info);
g_free (view->details->dnd);
/* FIXME bugzilla.eazel.com 2422: destroy drag_info */
disconnect_model_handlers (view);
gtk_object_unref (GTK_OBJECT (view->details->model));

3
libnautilus-extensions/nautilus-global-preferences.c
View file

@ -449,9 +449,6 @@ global_preferences_get_dialog (void)
return global_prefs_dialog;
}
/* FIXME bugzilla.eazel.com 1275:
* The actual defaults need to be user level specific.
*/
static const char *novice_default_sidebar_panel_iids[] =
{
"OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185",

5
libnautilus-extensions/nautilus-user-level-manager.c
View file

@ -44,11 +44,6 @@
#define NAUTILUS_IS_USER_LEVEL_MANAGER(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_USER_LEVEL_MANAGER))
#define NAUTILUS_IS_USER_LEVEL_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_USER_LEVEL_MANAGER))
/* FIXME bugzilla.eazel.com 2806:
* These names are used both by gconf paths and for user display.
* We need to maintain both separately, so the user-display ones can
* be capitalized and localized.
*/
static const char *DEFAULT_USER_LEVEL_NAMES_FOR_STORAGE[] =
{
"novice",

5
libnautilus-extensions/nautilus-view-identifier.h
View file

@ -25,11 +25,6 @@
#ifndef NAUTILUS_VIEW_IDENTIFIER_H
#define NAUTILUS_VIEW_IDENTIFIER_H
/* FIXME bugzilla.eazel.com 1291:
* Without this define liboaf doesn't include popt.h, causing trouble
* later; this mechanism should be fixed.
*/
#define HAVE_POPT_H
#include <liboaf/liboaf.h>
typedef struct {

3
libnautilus-private/nautilus-global-preferences.c
View file

@ -449,9 +449,6 @@ global_preferences_get_dialog (void)
return global_prefs_dialog;
}
/* FIXME bugzilla.eazel.com 1275:
* The actual defaults need to be user level specific.
*/
static const char *novice_default_sidebar_panel_iids[] =
{
"OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185",

5
libnautilus-private/nautilus-user-level-manager.c
View file

@ -44,11 +44,6 @@
#define NAUTILUS_IS_USER_LEVEL_MANAGER(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_USER_LEVEL_MANAGER))
#define NAUTILUS_IS_USER_LEVEL_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_USER_LEVEL_MANAGER))
/* FIXME bugzilla.eazel.com 2806:
* These names are used both by gconf paths and for user display.
* We need to maintain both separately, so the user-display ones can
* be capitalized and localized.
*/
static const char *DEFAULT_USER_LEVEL_NAMES_FOR_STORAGE[] =
{
"novice",

5
libnautilus-private/nautilus-view-identifier.h
View file

@ -25,11 +25,6 @@
#ifndef NAUTILUS_VIEW_IDENTIFIER_H
#define NAUTILUS_VIEW_IDENTIFIER_H
/* FIXME bugzilla.eazel.com 1291:
* Without this define liboaf doesn't include popt.h, causing trouble
* later; this mechanism should be fixed.
*/
#define HAVE_POPT_H
#include <liboaf/liboaf.h>
typedef struct {

12
src/file-manager/fm-list-view.c
View file

@ -689,7 +689,6 @@ fm_list_get_default_action (NautilusList *list,
switch (info) {
case NAUTILUS_ICON_DND_GNOME_ICON_LIST:
if (drop_data == NULL) {
*default_action = 0;
*non_default_action = 0;
@ -699,31 +698,28 @@ fm_list_get_default_action (NautilusList *list,
drop_target = nautilus_list_find_icon_list_drop_target (list, x, y,
drop_data,
list_view);
if (!drop_target) {
if (drop_target == NULL) {
*default_action = 0;
*non_default_action = 0;
return;
}
nautilus_drag_default_drop_action_for_icons (context, drop_target,
drop_data,
default_action, non_default_action);
break;
case NAUTILUS_ICON_DND_COLOR:
case NAUTILUS_ICON_DND_BGIMAGE:
*default_action = context->suggested_action;
*non_default_action = context->suggested_action;
break;
case NAUTILUS_ICON_DND_KEYWORD:
/* FIXME bugzilla.eazel.com 2572: Doesn't handle dropped keywords in
list view? Do we need to support this? */
*default_action = context->suggested_action;
*non_default_action = context->suggested_action;
break;
default:
}
}

3
src/nautilus-navigation-window.h
View file

@ -79,9 +79,6 @@ struct NautilusWindow {
/** CORBA-related elements **/
NautilusApplication *application;
/* FIXME bugzilla.eazel.com 916: Workaround for Bonobo bug. */
gboolean updating_bonobo_radio_menu_item;
/** State information **/
/* Information about current location/selection */

3
src/nautilus-object-window.h
View file

@ -79,9 +79,6 @@ struct NautilusWindow {
/** CORBA-related elements **/
NautilusApplication *application;
/* FIXME bugzilla.eazel.com 916: Workaround for Bonobo bug. */
gboolean updating_bonobo_radio_menu_item;
/** State information **/
/* Information about current location/selection */

7
src/nautilus-property-browser.c
View file

@ -1118,9 +1118,6 @@ add_background_to_browser (GtkWidget *widget, gpointer *data)
user_directory = nautilus_get_user_directory ();
/* copy the image file to the backgrounds directory */
/* FIXME bugzilla.eazel.com 1250:
* do we need to do this with gnome-vfs?
*/
directory_path = nautilus_make_path (user_directory, property_browser->details->category);
g_free (user_directory);
source_file_name = strrchr (path_name, '/');
@ -1135,7 +1132,7 @@ add_background_to_browser (GtkWidget *widget, gpointer *data)
| GNOME_VFS_PERM_OTHER_READ);
g_free (directory_uri);
}
g_free(directory_path);
result = nautilus_copy_uri_simple (path_name, destination_name);
@ -2109,7 +2106,7 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro
char *temp_category = g_strdup (property_browser->details->category);
/* FIXME: Not appropriate to assume the last
* character is s for all languages. A potential
* character is 's' for all languages. A potential
* translation problem.
*/
temp_category[strlen(temp_category) - 1] = '\0'; /* strip trailing s */

3
src/nautilus-spatial-window.h
View file

@ -79,9 +79,6 @@ struct NautilusWindow {
/** CORBA-related elements **/
NautilusApplication *application;
/* FIXME bugzilla.eazel.com 916: Workaround for Bonobo bug. */
gboolean updating_bonobo_radio_menu_item;
/** State information **/
/* Information about current location/selection */

3
src/nautilus-window.h
View file

@ -79,9 +79,6 @@ struct NautilusWindow {
/** CORBA-related elements **/
NautilusApplication *application;
/* FIXME bugzilla.eazel.com 916: Workaround for Bonobo bug. */
gboolean updating_bonobo_radio_menu_item;
/** State information **/
/* Information about current location/selection */

3
tools/README
View file

@ -1,3 +0,0 @@
The leak-checker and profiler have been moved to their own gnome cvs
module: eazel-tools. Please look there.