Commit 3f4aeca2 authored by Darin Adler's avatar Darin Adler

Remove Nautilus 1 news. This file is empty for now. Add some renaming

	* NEWS: Remove Nautilus 1 news. This file is empty for now.
	* RENAMING: Add some renaming ideas.
	* TODO: Add a tiny porting to-do list. I should take that
	survey of GNOME2_CONVERSION_COMPLETE that Havoc did and put
	it in here.
	* TRADEMARK_NOTICE: Removed this file. Eazel logo isn't in
	here any more.
	* Makefile.am: Remove TRADEMARK_NOTICE.

	* components/help/hyperbola-nav-index.c:
	* components/mozilla/nautilus-mozilla-content-view.c:
	* libnautilus-private/nautilus-authn-manager.c:
	* libnautilus-private/nautilus-file-operations-progress.c:
	* libnautilus-private/nautilus-file-operations-progress.h:
	* libnautilus-private/nautilus-file-operations.c:
	* libnautilus-private/nautilus-icon-dnd.c:
	* libnautilus-private/nautilus-program-chooser.c:
	* libnautilus-private/nautilus-program-chooser.h:
	* libnautilus-private/nautilus-program-choosing.c:
	* src/file-manager/fm-directory-view.c:
	* src/file-manager/fm-search-list-view.c:
	* src/file-manager/nautilus-indexing-info.c:
	* src/nautilus-about.c:
	* src/nautilus-about.h:
	* src/nautilus-application.c:
	* src/nautilus-bookmarks-window.c:
	* src/nautilus-location-bar.c:
	* src/nautilus-property-browser.c:
	* src/nautilus-shell.c:
	* src/nautilus-window-menus.c:
	* src/nautilus-window.c:
	First cut at converting to GtkDialog from GnomeDialog.
parent 25f9e45b
2001-11-08 Darin Adler <darin@bentspoon.com>
* NEWS: Remove Nautilus 1 news. This file is empty for now.
* RENAMING: Add some renaming ideas.
* TODO: Add a tiny porting to-do list. I should take that
survey of GNOME2_CONVERSION_COMPLETE that Havoc did and put
it in here.
* TRADEMARK_NOTICE: Removed this file. Eazel logo isn't in
here any more.
* Makefile.am: Remove TRADEMARK_NOTICE.
* components/help/hyperbola-nav-index.c:
* components/mozilla/nautilus-mozilla-content-view.c:
* libnautilus-private/nautilus-authn-manager.c:
* libnautilus-private/nautilus-file-operations-progress.c:
* libnautilus-private/nautilus-file-operations-progress.h:
* libnautilus-private/nautilus-file-operations.c:
* libnautilus-private/nautilus-icon-dnd.c:
* libnautilus-private/nautilus-program-chooser.c:
* libnautilus-private/nautilus-program-chooser.h:
* libnautilus-private/nautilus-program-choosing.c:
* src/file-manager/fm-directory-view.c:
* src/file-manager/fm-search-list-view.c:
* src/file-manager/nautilus-indexing-info.c:
* src/nautilus-about.c:
* src/nautilus-about.h:
* src/nautilus-application.c:
* src/nautilus-bookmarks-window.c:
* src/nautilus-location-bar.c:
* src/nautilus-property-browser.c:
* src/nautilus-shell.c:
* src/nautilus-window-menus.c:
* src/nautilus-window.c:
First cut at converting to GtkDialog from GnomeDialog.
2001-11-08 Anders Carlsson <andersca@gnu.org>
* libnautilus-private/nautilus-icon-dnd.c
......
......@@ -25,7 +25,6 @@ XXX = \
$(NULL)
EXTRA_DIST= \
TRADEMARK_NOTICE \
COPYING.LIB \
COPYING-DOCS \
HACKING \
......
=== Version 1.0.5
Nautilus 1.0.5 contains more speedups, and some features and bug
fixes.
Many of the changes for this release were done by hackers at Red Hat
(Jonathan Blandford, Havoc Pennington, Alex Larsson, Owen Taylor) for
their Nautilus release, and rolled into the main Nautilus sources,
mostly by Alex. Thanks also to Alan Cox for doing a profile of system
calls Nautilus was making and driving some simple but effective
speedups.
As a practical matter, many of the changes here that were inspired by
changes that others made or patches they submitted may still be marked
"(Darin)" since I did the actual check-i. Similarly, changes done by
others may be marked "(Alex)" since he did the rolling in even though
others did the original code (sometimes I tried to guess).
Here's a partial list of changes since Nautilus 1.0.4:
- speed-related changes
* Turn off trash emblem for speed (Darin)
* Cache more icons in the icon cache (Darin)
* Reduce number of suffixes to search for when locating icons (Darin)
* Remove Eazel logo graphics so we have one less place to search (Darin)
* Change internals of NautilusDirectory to avoid n^2 behavior on large
directory loads (Maciej)
* Add hash table for mapping icon data to icons in the icon container
to avoid n^2 behavior in large directories (Maciej)
* Cache user information so we don't do so many getpwuid calls (Alex)
* Add a help icon that fires up Nautilus (Alex)
* Load images with a 64K buffer in the image view (Darin)
* Don't fire up esd unless the MIME type says it's a music file (Anders)
* Don't refresh all other windows when you open a new window that
points to a particular location (Darin)
- features (mostly small ones)
* Eliminate ~/Nautilus, replacing it with "start here" (Havoc)
* Use ".desktop" files instead of Nautilus links (Alex, Maciej, Havoc,
Jonathan, Darin)
* Nautilus now requires Mozilla 0.9.5 or newer (Darin, Frank Belew)
* Allow dragging an image to the icon in the file properties dialog
to create a custom icon, as in the sidebar (Benedikt Roth)
* Allow Mozilla component to open Chrome windows (Alex)
* Add support for JFS (Frederic)
* Added get_info support to the stream adapter so we can work with
more components, specifically the eog one (Fabrice Bellet)
* Set _NET_WM_WINDOW_TYPE tag, mostly for kwin's benefit (Alex)
* Don't manage the desktop if kdesktop is already running (Havoc)
* Handle a lot more cases of dragging URIs to a Nautilus window
(Jonathan)
* Allow nested directories inside the scripts directory (David Emory
Watson, Darin)
* Remove Eazel remnants (Christian Meyer, Benedikt Roth, Darin)
* Make music view list look better by using EelList, show artist of
selected song (Maciej)
* Add authentication dialog support (Mike Fleming, Maciej)
* Show uptime in hardware view (Andy)
* Make modification time in sidebar shorten itself gracefully (Andy)
* Fix hang when FAM dies by using GIOChannel instead of gdk_input_add
(Alex)
- build-related changes
* Require newer bonobo, eel, gnome-vfs, librsvg (Darin)
* Get rid of the checks for ammonite and freetype (Darin)
* Fix makefiles for people who use DESTDIR (Evandro Fernandes Giovanini)
* Remove control center requirement (Anders)
* Update to build with Mozilla 0.9.3 (Darin)
* Fix doc build so it works on systems with newer docbook (Dan Mueth)
* Remove some duplicate libs to speed build up with libtool 1.4 (Anders)
* Require FAM if compiled with FAM support rather than trying to have
optional FAM support (Alex)
- significant bug fixes
* Fix problem that made Notes and History panels crash on startup if you
had already run Nautilus prviously on the same machine (Darin)
* Remove hard-coded colors from the default themes, and let automatic
color selection kick in (Alex)
* Don't monitor files on read-only volumes so CD-ROMs can be unmounted
without any trouble (Alex)
* Get rid of the flash on Nautilus startup (Jonathan, Alex)
* Stop trying to read GMC position metadata (Alex)
* Fix mount list problems that caused CD-ROM icons to be left on the
desktop even after unmounting and ejecting them (Owen)
* Fix leaks and other problems found by use of Insure (Yoann, Darin)
* Fix leaks found by use of memprof (Anders, Alex)
* Make DISPLAY canonical to give oaf's multi-DISPLAY support a better
chance of doing the right thing (Maciej)
* Make thumbnail code work even when the image is bad (Darin)
* Fix some state machine bugs that prevented item count from being
updated (Maciej)
* Fix some obscure DnD segfaults (Alex, Darin)
* Fix a few music view bugs (Maciej)
- i18n fixes (other than new translations)
* Make duplicate numbering scheme handle 11th, 12th, and 13th properly
(Benedikt Roth)
* Make hardware view internationalizable (Benedikt Roth)
* Set locale to "C" when running mount and unmount so we don't need to
understand error messages in multiple languages (Frederic)
* Use locale encoding when setting title for web view (Alex)
* Make "reset" image localizable (Andy)
- internal changes
* Rework of volume monitor to make it a easier to understand and
modify (Seth Nickell, Darin)
* Add "galeon mode" to gnome-info2html2 (Philip Langdale)
* Don't include frames in the thumbnail files on disk (Andy)
* Make "reset" use a special MIME type rather than "reset.png" (Andy)
* Make sidebar icon and text controllable by components so that the
shell doesn't need the special cases for Mozilla and Hardware (Andy)
* Get rid of assumption that GnomeVFSFileInfo fields match uid_t and
gid_t to make things more portable (Darin)
* Fix a bunch of places that were passing chars to ctype.h functions
which take ints to make things more portable (Darin)
* Other fixes for compiling on Solaris (Darin)
=== Version 1.0.4
Nautilus 1.0.4 contains some speedups, largely due to the work done by
Yoann Vandoorselaere to investigate what makes it slow. There's still
plenty of room for more work there.
There are also lots of other minor improvements since Nautilus 1.0.3.
A partial list of changes since Nautilus 1.0.3:
Fixes to bugs and other changes to speed up Nautilus's
display of new directories (Yoann, Darin, Maciej)
FreeBSD compile fixes (Darin, Gene)
Fixes to compile with C compilers that don't allow empty
structures (Darin)
Fix to the MOZILLA_FIVE_HOME setting code to make the Mozilla
component work in more configurations. (peter@ximian.com, Darin)
Make thumbnails always go in the home directory if "Make
Folder Appearance Details Public" is set to Never (John,
Michael Rothwell)
Fixed a few small i18n problems. (Darin)
Use Bonobo to handle additional key bindings, instead of using
our own hack code. (Darin)
Make default Web Search use google instead of the defunct
Eazel search page. (Darin)
Fix bug reading track info from MP3 files. (Jon K Hellan)
Make News panel flash less. (Andy)
Fixed bug in throbber destruction process (Darin, Owen)
Added prelighting and tracking to the throbber (Anders, Darin)
Use Control keys rather than Alt keys to move around in the
file manager windows because Sawfish changed to use Alt again
(John Harper)
Fix MIME bug that might lead to the wrong default component
getting used. This could have been what caused some people to
get the text view instead of the web page view. (Darin)
Fix problems typing non-ASCII characters on some systems
(Johan Dahlin, Darin)
Install IDL files for non-C component programmers (Johan
Dahlin, Darin, Ramiro)
Support trash on XFS volumes (Caleb J. Land, Darin)
Updated lots of icons, including most of the ones in the
classic GNOME theme (Ben FrantzDale, Seth Nickell)
Updated quick reference, release notes, and user manual in
help. (Dan Mueth)
Obfuscate passwords in URIs in thumbnail directories.
(Miguel Rodríguez Pérez)
Dumb down run-nautilus so it doesn't start Nautilus slowly.
It is really obsolete (Darin).
Get rid of Eazel home page and Eazel services in first-time
druid (Havoc)
Make standard view components hang around for 30 seconds,
making it faster to use the same viewer repeatedly (Zbigniew
Chyla).
Other bug fixes (Juan Pablo Mendoza, limval@yahoo.com,
Frederic Devernay, Darin, Benedikt Roth, Andy)
We won't be porting Nautilus to GNOME 2 until the library freeze date
(at the request of the library developers, Michael Meeks mainly) so
this is still a GNOME 1 source tree for now.
......@@ -12,6 +12,9 @@ When we rename files in the repository, we do it by this process:
This retains the history in both the old and new locations.
Remove a lot of nautilus prefixes since nothing outside libnautilus is
intended for use with other programs, so it doesn't need namespacing.
------
macros
------
......@@ -23,6 +26,7 @@ directory names
----------
file names
----------
*-ui.xml -> *.ui
src/file-manager/fm-* -> ?
hyperbola -> nautilus-help-system
nautilus-authn-manager.c -> nautilus-authentication-manager.c
......
You can see our planned tasks as bugs in http://bugzilla.gnome.org.
For tasks outside the porting effort, we track them as bugs in
http://bugzilla.gnome.org.
Porting tasks. Some are necessary and some are just cleanup.
- Get EelLabel working and switch back to it on the sidebar.
- Get rid of all the direct freetype use and switch to using
Pango instead.
- Visit all the destroy and move things into finalize or dispose
and make them callable twice as appropriate.
- Change things that use destroy handlers to use weak references
instead.
Copyright 2001 Eazel, Inc., and others. All Rights Reserved. Eazel,
the Eazel Logo, and Nautilus are trademarks of Eazel, Inc. (the "Eazel
Trademarks"). The Eazel Trademarks are distinct from the Eazel GPL
Software and are not subject to the provisions of the GPL.
This software contains files that include the Eazel Logo (the "Logo").
Eazel, Inc. has created and distributes certain software under the GNU
General Public License (GPL) (the "Eazel GPL Software"). The Logo is
distinct from the Eazel GPL Software and is not governed by the terms
of the GPL. You may only use the Logo pursuant to the terms contained
herein. The files that include the Eazel Logo can be removed without
impairing the way the Eazel GPL Software functions.
Eazel, Inc. grants you the right to use, copy, and redistribute the
Logo, but only in conjunction with the use, copying, or redistribution
of an official release of Eazel GPL Software that calls upon the Logo
during the normal course of operation and provided that,
1. The notice and this license are included with each copy you make,
and they are not altered, deleted, or modified in any way;
2. You do not modify the Logo, or the appearance of the Logo in any
manner;
3. You do not use the Logo as, or as part of, a trademark, trade name,
or trade identifier; or in any other fashion except as set forth in
this license; and
4. The Logo is only used, copied, or distributed in conjunction with
Eazel GPL Software that has not been modified from the form it was made
available by Eazel, Inc. You may modify Eazel GPL software pursuant to
the terms of the license that accompanies it, but if you do so, you may
not use, copy, or redistribute the Logo with the modified software.
NO WARRANTY.
THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
EAZEL, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
......@@ -2036,8 +2036,8 @@ create_index_select_page(HyperbolaNavigationIndex *hni)
hni->none_button = gtk_button_new();
gtk_container_add(GTK_CONTAINER(hni->none_button), label);
ok_button = gtk_button_new_with_label(_("OK"));
cancel_button = gtk_button_new_with_label(_("Cancel"));
ok_button = gtk_button_new_from_stock (GTK_STOCK_OK);
cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
gtk_signal_connect(GTK_OBJECT(ok_button), "clicked",
hyperbola_navigation_index_OK_button, hni);
......@@ -2245,7 +2245,7 @@ make_index_display_page(HyperbolaNavigationIndex *hni)
gtk_box_pack_start(GTK_BOX(top_hbox),hni->specific_rbutton,TRUE, TRUE, 0);
button = gtk_button_new_with_label("...");
button = gtk_button_new_with_label ("...");
gtk_signal_connect(GTK_OBJECT(button),"clicked",make_index_select_page,hni);
gtk_box_pack_end(GTK_BOX(top_hbox), button, FALSE, FALSE, 5);
......
......@@ -851,7 +851,7 @@ mozilla_title_changed_callback (GtkMozEmbed *mozilla, gpointer user_data)
static void
mozilla_new_window_callback (GtkMozEmbed *mozilla, GtkMozEmbed **new_mozilla, guint chromemask, NautilusMozillaContentView *view)
{
static GnomeDialog *dialog;
static GtkDialog *dialog;
NautilusMozillaContentViewChrome *chrome;
/* it's a chrome window so just create a simple shell to play with. */
......
......@@ -717,14 +717,14 @@ void mpg123_configure(void)
gtk_button_box_set_spacing(GTK_BUTTON_BOX(bbox), 5);
gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
ok = gtk_button_new_with_label(_("Ok"));
ok = gtk_button_new_from_stock (GTK_STOCK_OK);
gtk_signal_connect(GTK_OBJECT(ok), "clicked", G_CALLBACK(mpg123_configurewin_ok), NULL);
GTK_WIDGET_SET_FLAGS(ok, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(bbox), ok, TRUE, TRUE, 0);
gtk_widget_show(ok);
gtk_widget_grab_default(ok);
cancel = gtk_button_new_with_label(_("Cancel"));
cancel = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
gtk_signal_connect_object(GTK_OBJECT(cancel), "clicked", G_CALLBACK(gtk_widget_destroy), GTK_OBJECT(mpg123_configurewin));
GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
......
......@@ -2013,7 +2013,7 @@ add_command_buttons (News *news_data, const char* label, gboolean from_configure
(GtkSignalFunc) add_site_button_clicked, news_data);
}
button = gtk_button_new_with_label (label);
button = gtk_button_new_from_stock (label);
gtk_container_add (GTK_CONTAINER (button_box), button);
g_signal_connect (G_OBJECT (button), "clicked",
......@@ -2354,7 +2354,7 @@ set_up_edit_widgets (News *news, GtkWidget *container)
gtk_box_pack_start (GTK_BOX (expand_box), temp_vbox, TRUE, TRUE, 0);
/* add the button box at the bottom with a cancel button */
button_box = add_command_buttons (news, _("Cancel"), FALSE);
button_box = add_command_buttons (news, GTK_STOCK_CANCEL, FALSE);
gtk_box_pack_start (GTK_BOX (news->edit_site_box), button_box, FALSE, FALSE, 0);
}
......
......@@ -118,7 +118,7 @@ mark_callback_completed (CallbackInfo *info)
}
static void
authentication_dialog_button_clicked (GnomeDialog *dialog,
authentication_dialog_button_clicked (GtkDialog *dialog,
gint button_number,
CallbackInfo *info)
{
......@@ -137,7 +137,7 @@ authentication_dialog_button_clicked (GnomeDialog *dialog,
}
static void
authentication_dialog_closed (GnomeDialog *dialog, CallbackInfo *info)
authentication_dialog_closed (GtkDialog *dialog, CallbackInfo *info)
{
DEBUG_MSG (("+%s\n", __FUNCTION__));
......@@ -145,7 +145,7 @@ authentication_dialog_closed (GnomeDialog *dialog, CallbackInfo *info)
}
static void
authentication_dialog_destroyed (GnomeDialog *dialog, CallbackInfo *info)
authentication_dialog_destroyed (GtkDialog *dialog, CallbackInfo *info)
{
DEBUG_MSG (("+%s\n", __FUNCTION__));
......
......@@ -37,6 +37,7 @@
#include <gtk/gtkhbox.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkprogressbar.h>
#include <gtk/gtkstock.h>
#include <gtk/gtktable.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-stock-icons.h>
......@@ -57,8 +58,8 @@ static void nautilus_file_operations_progress_class_init (NautilusFileOperations
static void nautilus_file_operations_progress_init (NautilusFileOperationsProgress *dialog);
EEL_CLASS_BOILERPLATE (NautilusFileOperationsProgress,
nautilus_file_operations_progress,
GNOME_TYPE_DIALOG);
nautilus_file_operations_progress,
GTK_TYPE_DIALOG)
struct NautilusFileOperationsProgressDetails {
GtkWidget *progress_title_label;
......@@ -121,10 +122,9 @@ set_text_unescaped_trimmed (EelEllipsizingLabel *label, const char *text)
/* This is just to make sure the dialog is not closed without explicit
* intervention.
*/
static gboolean
close_callback (GnomeDialog *dialog)
static void
close_callback (GtkDialog *dialog)
{
return FALSE;
}
/* GtkObject methods. */
......@@ -201,7 +201,7 @@ nautilus_file_operations_progress_init (NautilusFileOperationsProgress *progress
progress->details = g_new0 (NautilusFileOperationsProgressDetails, 1);
vbox = GTK_BOX (GNOME_DIALOG (progress)->vbox);
vbox = GTK_BOX (GTK_DIALOG (progress)->vbox);
/* This is evil but makes the dialog look less cramped. */
gtk_container_set_border_width (GTK_CONTAINER (vbox), OUTER_BORDER);
......@@ -260,11 +260,11 @@ nautilus_file_operations_progress_class_init (NautilusFileOperationsProgressClas
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
GnomeDialogClass *dialog_class;
GtkDialogClass *dialog_class;
object_class = GTK_OBJECT_CLASS (klass);
widget_class = GTK_WIDGET_CLASS (klass);
dialog_class = GNOME_DIALOG_CLASS (klass);
dialog_class = GTK_DIALOG_CLASS (klass);
object_class->destroy = nautilus_file_operations_progress_destroy;
......@@ -299,8 +299,7 @@ nautilus_file_operations_progress_new (const char *title,
gtk_window_set_title (GTK_WINDOW (widget), title);
gtk_window_set_wmclass (GTK_WINDOW (widget), "file_progress", "Nautilus");
gnome_dialog_append_button (GNOME_DIALOG (widget),
GNOME_STOCK_BUTTON_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (widget), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
progress->details->from_prefix = from_prefix;
progress->details->to_prefix = to_prefix;
......@@ -437,7 +436,7 @@ nautilus_file_operations_progress_done (NautilusFileOperationsProgress *progress
}
/* No cancel button once the operation is done. */
gnome_dialog_set_sensitive (GNOME_DIALOG (progress), 0, FALSE);
gtk_dialog_set_response_sensitive (GTK_DIALOG (progress), GTK_RESPONSE_CANCEL, FALSE);
progress->details->delayed_close_timeout_id = gtk_timeout_add
(MINIMUM_TIME_UP - time_up,
......
......@@ -29,17 +29,17 @@
#ifndef NAUTILUS_FILE_OPERATIONS_PROGRESS_H
#define NAUTILUS_FILE_OPERATIONS_PROGRESS_H
#include <libgnomeui/gnome-dialog.h>
#include <gtk/gtkdialog.h>
typedef struct NautilusFileOperationsProgressDetails NautilusFileOperationsProgressDetails;
typedef struct {
GnomeDialog dialog;
GtkDialog dialog;
NautilusFileOperationsProgressDetails *details;
} NautilusFileOperationsProgress;
typedef struct {
GnomeDialogClass parent_class;
GtkDialogClass parent_class;
} NautilusFileOperationsProgressClass;
#define NAUTILUS_FILE_OPERATIONS_PROGRESS(obj) \
......
......@@ -332,11 +332,16 @@ center_dialog_over_window (GtkWindow *window, GtkWindow *over)
center_dialog_over_rect (window, rect);
}
static gboolean
handle_close_callback (GnomeDialog *dialog, TransferInfo *tranfer_info)
static void
handle_response_callback (GtkDialog *dialog, int response, TransferInfo *transfer_info)
{
transfer_info->cancelled = TRUE;
}
static void
handle_close_callback (GtkDialog *dialog, TransferInfo *transfer_info)
{
tranfer_info->cancelled = TRUE;
return FALSE;
transfer_info->cancelled = TRUE;
}
static void
......@@ -356,13 +361,13 @@ create_transfer_dialog (const GnomeVFSXferProgressInfo *progress_info,
* the same as clicking cancel.
*/
g_signal_connect (G_OBJECT (transfer_info->progress_dialog),
"clicked",
G_CALLBACK (gnome_dialog_close),
NULL);
"response",
G_CALLBACK (handle_response_callback),
NULL);
g_signal_connect (G_OBJECT (transfer_info->progress_dialog),
"close",
G_CALLBACK (handle_close_callback),
transfer_info);
"close",
G_CALLBACK (handle_close_callback),
transfer_info);
/* Make the progress dialog show up over the window we are copying into */
if (transfer_info->parent_view != NULL) {
......@@ -1083,7 +1088,7 @@ handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
}
eel_run_simple_dialog (parent_for_error_dialog (transfer_info), TRUE, text,
_("Unable to replace file."), _("OK"), NULL, NULL);
_("Unable to replace file."), GTK_STOCK_OK, NULL, NULL);
g_free (text);
g_free (formatted_name);
......@@ -2269,6 +2274,7 @@ confirm_empty_trash (GtkWidget *parent_view)
{
GtkDialog *dialog;
GtkWindow *parent_window;
int response;
/* Just Say Yes if the preference says not to confirm. */
if (!eel_preferences_get_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH)) {
......@@ -2287,7 +2293,11 @@ confirm_empty_trash (GtkWidget *parent_view)
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
return gtk_dialog_run (dialog) == GTK_RESPONSE_OK;
response = gtk_dialog_run (dialog);
gtk_object_destroy (GTK_OBJECT (dialog));
return response == GTK_RESPONSE_OK;
}
void
......
......@@ -47,6 +47,7 @@
#include <gdk/gdkx.h>
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkstock.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include <libgnomeui/gnome-stock-icons.h>
......@@ -760,6 +761,7 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
{
const char *message;
GtkDialog *dialog;
int response;
/* FIXME bugzilla.gnome.org 40915: Use of the word "directory"
* makes this FMIconView specific. Move these messages into
......@@ -787,11 +789,14 @@ confirm_switch_to_manual_layout (NautilusIconContainer *container)
}
dialog = eel_show_yes_no_dialog (message, _("Switch to Manual Layout?"),
_("Switch"), _("Cancel"),
_("Switch"), GTK_STOCK_CANCEL,
GTK_WINDOW (gtk_widget_get_ancestor
(GTK_WIDGET (container), GTK_TYPE_WINDOW)));
return gtk_dialog_run (dialog) == GTK_RESPONSE_OK;
response = gtk_dialog_run (dialog);
gtk_object_destroy (GTK_OBJECT (dialog));
return response == GTK_RESPONSE_OK;
}
static void
......
......@@ -41,11 +41,14 @@
#include <gtk/gtkmain.h>
#include <gtk/gtkradiobutton.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkstock.h>
#include <gtk/gtkvbox.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-stock-icons.h>
#include <libgnomeui/gnome-uidefs.h>
#define RESPONSE_CHOOSE 1000
enum {
PROGRAM_LIST_NAME_COLUMN,
PROGRAM_LIST_STATUS_COLUMN,
......@@ -311,7 +314,7 @@ program_file_pair_get_long_status_text (ProgramFilePair *pair)
}
static GnomeVFSMimeActionType
nautilus_program_chooser_get_type (GnomeDialog *program_chooser)
nautilus_program_chooser_get_type (GtkDialog *program_chooser)
{
GnomeVFSMimeActionType type;
......@@ -324,7 +327,7 @@ nautilus_program_chooser_get_type (GnomeDialog *program_chooser)
}
static void
repopulate_program_list (GnomeDialog *program_chooser,
repopulate_program_list (GtkDialog *program_chooser,
NautilusFile *file,
GtkCList *clist)
{
......@@ -385,38 +388,38 @@ repopulate_program_list (GnomeDialog *program_chooser,
}
static NautilusFile *
nautilus_program_chooser_get_file (GnomeDialog *chooser)
nautilus_program_chooser_get_file (GtkDialog *chooser)
{
return NAUTILUS_FILE (g_object_get_data (G_OBJECT (chooser), "file"));
}
static GtkCList *
nautilus_program_chooser_get_clist (GnomeDialog *chooser)
nautilus_program_chooser_get_clist (GtkDialog *chooser)
{
return GTK_CLIST (g_object_get_data (G_OBJECT (chooser), "clist"));
}
static GtkFrame *
nautilus_program_chooser_get_frame (GnomeDialog *chooser)
nautilus_program_chooser_get_frame (GtkDialog *chooser)
{
return GTK_FRAME (g_object_get_data (G_OBJECT (chooser), "frame"));
}
static GtkLabel *
nautilus_program_chooser_get_status_label (GnomeDialog *chooser)
nautilus_program_chooser_get_status_label (GtkDialog *chooser)
{
return GTK_LABEL (g_object_get_data (G_OBJECT (chooser), "status_label"));
}
static void
nautilus_program_chooser_set_is_cancellable (GnomeDialog *chooser, gboolean cancellable)
nautilus_program_chooser_set_is_cancellable (GtkDialog *chooser, gboolean cancellable)
{
#if GNOME2_CONVERSION_COMPLETE
GtkButton *done_button, *cancel_button;
cancel_button = eel_gnome_dialog_get_button_by_index
cancel_button = eel_gtk_dialog_get_button_by_index
(chooser, GNOME_CANCEL);
done_button = eel_gnome_dialog_get_button_by_index
done_button = eel_gtk_dialog_get_button_by_index
(chooser, GNOME_CANCEL+1);
if (cancellable) {
......@@ -430,7 +433,7 @@ nautilus_program_chooser_set_is_cancellable (GnomeDialog *chooser, gboolean canc
}
static void
nautilus_program_chooser_set_file (GnomeDialog *chooser, NautilusFile *file)
nautilus_program_chooser_set_file (GtkDialog *chooser, NautilusFile *file)
{
nautilus_file_ref (file);
g_object_set_data_full (G_OBJECT (chooser),
......@@ -440,19 +443,19 @@ nautilus_program_chooser_set_file (GnomeDialog *chooser, NautilusFile *file)
}
static void
nautilus_program_chooser_set_clist (GnomeDialog *chooser, GtkCList *clist)
nautilus_program_chooser_set_clist (GtkDialog *chooser, GtkCList *clist)
{
g_object_set_data (G_OBJECT (chooser), "clist", clist);
}
static void
nautilus_program_chooser_set_frame (GnomeDialog *chooser, GtkFrame *frame)
nautilus_program_chooser_set_frame (GtkDialog *chooser, GtkFrame *frame)
{
g_object_set_data (G_OBJECT (chooser), "frame", frame);
}
static void
nautilus_program_chooser_set_status_label (GnomeDialog *chooser, GtkLabel *status_label)
nautilus_program_chooser_set_status_label (GtkDialog *chooser, GtkLabel *status_label)
{
g_object_set_data (G_OBJECT (chooser), "status_label", status_label);
}
......@@ -693,7 +696,7 @@ get_program_file_pair_from_row_data (GtkCList *clist, int row)
}
static ProgramFilePair *
get_selected_program_file_pair (GnomeDialog *dialog)
get_selected_program_file_pair (GtkDialog *dialog)
{
GtkCList *clist;
int selected_row;
......@@ -709,7 +712,7 @@ get_selected_program_file_pair (GnomeDialog *dialog)
}
static void
update_selected_item_details (GnomeDialog *dialog)
update_selected_item_details (GtkDialog *dialog)
{
GtkFrame *frame;
GtkLabel *status_label;
......@@ -737,7 +740,7 @@ update_selected_item_details (GnomeDialog *dialog)
}