diff options
| author | Federico Mena Quintero <federico@src.gnome.org> | 2000-08-16 20:42:08 +0000 |
|---|---|---|
| committer | Federico Mena Quintero <federico@src.gnome.org> | 2000-08-16 20:42:08 +0000 |
| commit | 1bda924eb7b9ddfeb8f687f28b994aab6a49d65e (patch) | |
| tree | 6ef6f3777cd4b70b68d02b2bf727675a4f58b196 | |
| parent | 4d4ad189c8a5a1f0c668876f16ce310e5eb6e7de (diff) | |
| download | eog-1bda924eb7b9ddfeb8f687f28b994aab6a49d65e.tar.gz | |
Last night's preparations for 0.4 - Federico
83 files changed, 222 insertions, 169 deletions
@@ -1 +1 @@ -Federico Mena-Quintero (federico@gimp.org) +Federico Mena-Quintero (federico@gnu.org) @@ -1,3 +1,12 @@ +2000-08-16 Federico Mena Quintero <federico@helixcode.com> + + * configure.in: Bumped version number to 0.4. Removed stale + gnumeric_executable cruft from the initial cut & paste. + + * README: Updates. + + * DEPENDS: List gconf and libglade. + 2000-08-10 Federico Mena Quintero <federico@helixcode.com> * configure.in: Require gconf 0.8. HAH. @@ -2,3 +2,5 @@ gnome-libs gdk-pixbuf bonobo gnome-print +gconf +libglade @@ -19,10 +19,10 @@ Programming Guidelines, understand their purpose, and keep them in mind when writing code for EOG. If you want to put code in EOG, I would like to review it first. -Please mail me a patch to <federico@gimp.org>. If you wish to -commit to the bonobo component please send a patch to <mmeeks@gnu.org>. -This is to ensure that the code fits well within the grand plan for -EOG. This is not fascism, it is simple and innocent paranoia. +Please mail me a patch to <federico@gnu.org>. If you wish to commit +to the Bonobo component please send a patch to <mmeeks@gnu.org>. This +is to ensure that the code fits well within the grand plan for EOG. +This is not fascism, it is simple and innocent paranoia. The reason for this is that EOG code base will grow to be substantially big. It will be a full product for image viewing and @@ -31,4 +31,4 @@ that the code will be able to sustain such work. Federico Mena-Quintero -federico@gimp.org +federico@gnu.org diff --git a/MAINTAINERS b/MAINTAINERS index 20dca0ad..bacb5576 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1 +1 @@ -Email: federico@gimp.org +Email: federico@gnu.org @@ -21,15 +21,19 @@ program. Requirements ------------ -This package requires the stable gnome-libs package and the -development gdk-pixbuf library. +This package requires the following modules to be installed: +gnome-libs, gdk-pixbuf, Bonobo, gnome-print, GConf, and libglade. + +You can get these packages from the GNOME FTP server (ftp.gnome.org) +or from other sources where GNOME packages are distributed. Availability ------------ -The latest version of this package is available from the GNOME CVS -repository at cvs.gnome.org or the FTP site at ftp.gnome.org. +The bleeding-edge version of this package is always available from the +GNOME CVS repository at cvs.gnome.org. Released versions are +available by FTP site at ftp.gnome.org. Reporting bugs @@ -49,4 +53,4 @@ License. Please see the file COPYING for details. Author ------ -Federico Mena-Quintero (federico@gimp.org) +Federico Mena-Quintero (federico@gnu.org) @@ -1,16 +1,23 @@ Many kudos, thanks, beers, and brownie points to: Mark Crichton <crichton@gimp.org> - Wrote the initial versions - of GdkPixbuf, and bravely tweaked Imlib for GNOME. + of GdkPixbuf, and bravely maintained Imlib for GNOME's + purposes. And rode us around in the minivan of death. + + Arik Devens <arik@helixcode.com> - Wrote the preferences code + for EOG and provided many interesting conversations. And lent + me his comic books, which are insanely cool. Damien Diederen <dash@linuxbe.org> - Wrote the original fast scaling code that was the inspiration for EOG. Tuomas Kuosmanen <tigert@gimp.org> - Created the cute icon for - EOG, as well as lots of nice artwork. + EOG, as well as lots of nice artwork. That artwork was + proudly viewed in EOG as well. Raph Levien <raph@gimp.org> - Wrote libart, microtile arrays, - GdkRGB, and some awesome code for doing imaging fast. + GdkRGB, and some awesome code for doing imaging *fast*. + Provided a botomless pit of knowledge. Michael Meeks <mmeeks@gnu.org> - Wrote the initial Bonobo stuff for EOG, and provided good feedback all along. @@ -19,7 +26,8 @@ Many kudos, thanks, beers, and brownie points to: and provided excellent feedback for EOG. Owen Taylor <otaylor@redhat.com> - Wrote the awesome scaling - and compositing functions for GdkPixbuf. + and compositing functions for GdkPixbuf. Also provided an + really bottomless pit of knowledge. The GNOME translation team - For letting us use EOG in a zillion languages. @@ -1,5 +1,11 @@ If you intend to work on any of these issues, please contact -Federico Mena-Quintero (federico@gimp.org). +Federico Mena-Quintero (federico@gnu.org). + +* Bugs: + + - When a window is created with a new image (i.e. by running + the program from the command line or by turning on "open + images in a new window", auto-sizing does not work. * Finish the ImageView widget: @@ -78,4 +84,4 @@ Federico Mena-Quintero (federico@gimp.org). tearing, and only use the normal tearing method when the user changes the zoom/scroll. -* Write the user's, programmer's, and API reference manuals. +* Write the programmer's and API reference manuals. diff --git a/configure.in b/configure.in index 354d5ce6..8f43e68c 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_INIT(src/image-view.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(eog, 0.3) +AM_INIT_AUTOMAKE(eog, 0.4) AM_MAINTAINER_MODE @@ -77,8 +77,6 @@ AC_ARG_WITH(bonobo, fi ) -gnumeric_executable=gnumeric -AC_SUBST(gnumeric_executable) if $try_bonobo; then AC_MSG_CHECKING(for Bonobo > 0.9) if gnome-config --libs bonobox_print > /dev/null 2>&1; then @@ -98,7 +96,6 @@ if $try_bonobo; then have_bonobo=true bonobo=bonobox_print bonobo_msg=yes - gnumeric_executable=gnumeric-bonobo else AC_MSG_RESULT(not found) fi diff --git a/libeog/cursors.c b/libeog/cursors.c index 9896419d..b1b81596 100644 --- a/libeog/cursors.c +++ b/libeog/cursors.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - mouse cursors * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libeog/cursors.h b/libeog/cursors.h index 6e44b92a..1da38a79 100644 --- a/libeog/cursors.h +++ b/libeog/cursors.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - mouse cursors * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libeog/gtkscrollframe.c b/libeog/gtkscrollframe.c index 8bd71923..a607bb51 100644 --- a/libeog/gtkscrollframe.c +++ b/libeog/gtkscrollframe.c @@ -548,9 +548,12 @@ gtk_scroll_frame_size_request (GtkWidget *widget, GtkRequisition *requisition) gtk_widget_size_request (bin->child, &child_requisition); +#if 0 if (priv->hsb_policy == GTK_POLICY_NEVER) requisition->width += child_requisition.width; - else { + else +#endif + { GtkWidgetAuxInfo *aux_info; aux_info = gtk_object_get_data_by_id (GTK_OBJECT (bin->child), @@ -562,9 +565,12 @@ gtk_scroll_frame_size_request (GtkWidget *widget, GtkRequisition *requisition) requisition->width += vsb_requisition.width; } +#if 0 if (priv->vsb_policy == GTK_POLICY_NEVER) requisition->height += child_requisition.height; - else { + else +#endif + { GtkWidgetAuxInfo *aux_info; aux_info = gtk_object_get_data_by_id (GTK_OBJECT (bin->child), diff --git a/libeog/image-view.c b/libeog/image-view.c index e532d4fb..cf365582 100644 --- a/libeog/image-view.c +++ b/libeog/image-view.c @@ -2,7 +2,7 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -290,10 +290,8 @@ image_view_init (ImageView *view) priv->client = gconf_client_get_default (); -#if 0 gconf_client_add_dir (priv->client, "/apps/eog", GCONF_CLIENT_PRELOAD_RECURSIVE, NULL); -#endif priv->interp_type_notify_id = gconf_client_notify_add ( priv->client, "/apps/eog/view/interp_type", @@ -395,9 +393,7 @@ image_view_destroy (GtkObject *object) priv->dither_notify_id = 0; priv->scroll_notify_id = 0; -#if 0 - gconf_client_remove_dir (priv->client, "/apps/eog"); -#endif + gconf_client_remove_dir (priv->client, "/apps/eog", NULL); /* Clean up */ @@ -1408,6 +1404,9 @@ image_view_key_press (GtkWidget *widget, GdkEventKey *event) xofs = yofs = 0; zoom = 1.0; + if ((event->state & (GDK_MODIFIER_MASK & ~GDK_LOCK_MASK)) != 0) + return FALSE; + switch (event->keyval) { case GDK_Up: do_scroll = TRUE; diff --git a/libeog/image-view.h b/libeog/image-view.h index 48ee8ed6..74fe1836 100644 --- a/libeog/image-view.h +++ b/libeog/image-view.h @@ -2,7 +2,7 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libeog/image.c b/libeog/image.c index f2a07281..cabe82c0 100644 --- a/libeog/image.c +++ b/libeog/image.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - image structure and image loading * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libeog/image.h b/libeog/image.h index 1f283b91..0b3d86a0 100644 --- a/libeog/image.h +++ b/libeog/image.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - image structure and image loading * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libeog/ui-image.c b/libeog/ui-image.c index 565eab50..80e79b59 100644 --- a/libeog/ui-image.c +++ b/libeog/ui-image.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - scrolling user interface for image views * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libeog/ui-image.h b/libeog/ui-image.h index 66b08431..7649af8d 100644 --- a/libeog/ui-image.h +++ b/libeog/ui-image.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - user interface for image views * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libeog/uta.c b/libeog/uta.c index 238c04cf..d8d9e247 100644 --- a/libeog/uta.c +++ b/libeog/uta.c @@ -2,7 +2,7 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libeog/uta.h b/libeog/uta.h index d7162dbe..0d2b5045 100644 --- a/libeog/uta.h +++ b/libeog/uta.h @@ -2,7 +2,7 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libeog/zoom.c b/libeog/zoom.c index ea21d996..62a466a6 100644 --- a/libeog/zoom.c +++ b/libeog/zoom.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - utility functions for computing zoom factors * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libeog/zoom.h b/libeog/zoom.h index 0a37f0cd..315669e7 100644 --- a/libeog/zoom.h +++ b/libeog/zoom.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - utility functions for computing zoom factors * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/shell/e-dialog-widgets.c b/shell/e-dialog-widgets.c index 5c3b8e61..ce1bf36c 100644 --- a/shell/e-dialog-widgets.c +++ b/shell/e-dialog-widgets.c @@ -2,7 +2,7 @@ * * Copyright (C) 2000 Helix Code, Inc. * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@helixcode.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/shell/e-dialog-widgets.h b/shell/e-dialog-widgets.h index 5172d31d..daf05397 100644 --- a/shell/e-dialog-widgets.h +++ b/shell/e-dialog-widgets.h @@ -2,7 +2,7 @@ * * Copyright (C) 2000 Helix Code, Inc. * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@helixcode.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/shell/preferences.c b/shell/preferences.c index 958a957e..f3b59b78 100644 --- a/shell/preferences.c +++ b/shell/preferences.c @@ -2,7 +2,8 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Authors: Federico Mena-Quintero <federico@gnu.org> + * Arik Devens <arik@helixcode.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/shell/preferences.h b/shell/preferences.h index e5d7a5cf..bc1a49c0 100644 --- a/shell/preferences.h +++ b/shell/preferences.h @@ -2,7 +2,8 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Authors: Federico Mena-Quintero <federico@gnu.org> + * Arik Devens <arik@helixcode.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/shell/util.c b/shell/util.c index cba46bdd..10382207 100644 --- a/shell/util.c +++ b/shell/util.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - miscellaneous utility functions * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/shell/util.h b/shell/util.h index edc5e96c..a677414d 100644 --- a/shell/util.h +++ b/shell/util.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - miscellaneous utility functions * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/ChangeLog b/src/ChangeLog index 2a2ad34b..45ca9355 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,19 @@ +2000-08-16 Federico Mena Quintero <federico@helixcode.com> + + * gtkscrollframe.c (gtk_scroll_frame_size_request): Using the + child's requisition as our own requisition when the scrollbar + policy is NEVER is *highly* broken. The scrolling interface needs + to be rethought. In the meantime, disable that code so that we + always follow the code path for the other policies. + + * image-view.c: Restore the gconf_client_add_dir() stuff. + + * full-screen.c: Likewise. + + * window.c: Likewise. + + * *.[ch]: Date/email updates. + 2000-07-28 Federico Mena Quintero <federico@helixcode.com> * window.c (open_new_window): Moved the opening in a new window diff --git a/src/commands.c b/src/commands.c index 2570c513..b3a28c59 100644 --- a/src/commands.c +++ b/src/commands.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - commands selectable from the menus and toolbars * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/commands.h b/src/commands.h index 34cd2c58..9b007386 100644 --- a/src/commands.h +++ b/src/commands.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - commands selectable from the menus and toolbars * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cursors.c b/src/cursors.c index 9896419d..b1b81596 100644 --- a/src/cursors.c +++ b/src/cursors.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - mouse cursors * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/cursors.h b/src/cursors.h index 6e44b92a..1da38a79 100644 --- a/src/cursors.h +++ b/src/cursors.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - mouse cursors * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/e-dialog-widgets.c b/src/e-dialog-widgets.c index 5c3b8e61..ce1bf36c 100644 --- a/src/e-dialog-widgets.c +++ b/src/e-dialog-widgets.c @@ -2,7 +2,7 @@ * * Copyright (C) 2000 Helix Code, Inc. * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@helixcode.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/e-dialog-widgets.h b/src/e-dialog-widgets.h index 5172d31d..daf05397 100644 --- a/src/e-dialog-widgets.h +++ b/src/e-dialog-widgets.h @@ -2,7 +2,7 @@ * * Copyright (C) 2000 Helix Code, Inc. * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@helixcode.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/full-screen.c b/src/full-screen.c index 092a3684..172032c0 100644 --- a/src/full-screen.c +++ b/src/full-screen.c @@ -2,7 +2,7 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -156,10 +156,8 @@ full_screen_init (FullScreen *fs) priv->client = gconf_client_get_default (); -#if 0 gconf_client_add_dir (priv->client, "/apps/eog", GCONF_CLIENT_PRELOAD_RECURSIVE, NULL); -#endif priv->sb_policy_notify_id = gconf_client_notify_add ( priv->client, "/apps/eog/full_screen/sb_policy", @@ -213,6 +211,8 @@ full_screen_finalize (GtkObject *object) priv->sb_policy_notify_id = 0; priv->bevel_notify_id = 0; + gconf_client_remove_dir (priv->client, "/apps/eog", NULL); + gtk_object_unref (GTK_OBJECT (priv->client)); priv->client = NULL; diff --git a/src/full-screen.h b/src/full-screen.h index 04a5ccf0..81bc4f6f 100644 --- a/src/full-screen.h +++ b/src/full-screen.h @@ -2,7 +2,7 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/gnome-icon-caption.c b/src/gnome-icon-caption.c index 0f0b7806..b14ca51e 100644 --- a/src/gnome-icon-caption.c +++ b/src/gnome-icon-caption.c @@ -1,8 +1,8 @@ /* GNOME libraries - canvas item for icon captions * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Authors: Federico Mena-Quintero <federico@gimp.org> + * Authors: Federico Mena-Quintero <federico@gnu.org> * Miguel de Icaza <miguel@gnu.org> * * This library is free software; you can redistribute it and/or diff --git a/src/gnome-icon-caption.h b/src/gnome-icon-caption.h index 8fae4faf..5059309f 100644 --- a/src/gnome-icon-caption.h +++ b/src/gnome-icon-caption.h @@ -1,8 +1,8 @@ /* GNOME libraries - canvas item for icon captions * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Authors: Federico Mena-Quintero <federico@gimp.org> + * Authors: Federico Mena-Quintero <federico@gnu.org> * Miguel de Icaza <miguel@gnu.org> * * This library is free software; you can redistribute it and/or diff --git a/src/gnome-icon-item-factory.c b/src/gnome-icon-item-factory.c index 4d788e3e..9bec2a12 100644 --- a/src/gnome-icon-item-factory.c +++ b/src/gnome-icon-item-factory.c @@ -1,8 +1,8 @@ /* GNOME libraries - default item factory for icon lists * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-icon-item-factory.h b/src/gnome-icon-item-factory.h index 6b5f756a..a1a3d0c8 100644 --- a/src/gnome-icon-item-factory.h +++ b/src/gnome-icon-item-factory.h @@ -1,8 +1,8 @@ /* GNOME libraries - default item factory for icon lists * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-icon-list-model.c b/src/gnome-icon-list-model.c index 888ddafd..887cc16a 100644 --- a/src/gnome-icon-list-model.c +++ b/src/gnome-icon-list-model.c @@ -1,8 +1,8 @@ /* GNOME libraries - abstract icon list model * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-icon-list-model.h b/src/gnome-icon-list-model.h index c0c4c23a..351d5398 100644 --- a/src/gnome-icon-list-model.h +++ b/src/gnome-icon-list-model.h @@ -1,8 +1,8 @@ /* GNOME libraries - abstract icon list model * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-icon-view.c b/src/gnome-icon-view.c index e48f3631..f5860e9f 100644 --- a/src/gnome-icon-view.c +++ b/src/gnome-icon-view.c @@ -1,8 +1,8 @@ /* GNOME libraries - icon view for an icon list model * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-icon-view.h b/src/gnome-icon-view.h index 2ec9db87..8e403feb 100644 --- a/src/gnome-icon-view.h +++ b/src/gnome-icon-view.h @@ -1,8 +1,8 @@ /* GNOME libraries - icon view for an icon list model * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-list-item-factory.c b/src/gnome-list-item-factory.c index 6cf9f079..3d8badac 100644 --- a/src/gnome-list-item-factory.c +++ b/src/gnome-list-item-factory.c @@ -1,8 +1,8 @@ /* GNOME libraries - abstract list item factory * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-list-item-factory.h b/src/gnome-list-item-factory.h index 5db0bd48..e2d78d87 100644 --- a/src/gnome-list-item-factory.h +++ b/src/gnome-list-item-factory.h @@ -1,8 +1,8 @@ /* GNOME libraries - abstract list item factory * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-list-model.c b/src/gnome-list-model.c index 8229932d..bf384602 100644 --- a/src/gnome-list-model.c +++ b/src/gnome-list-model.c @@ -1,8 +1,8 @@ /* GNOME libraries - abstract list model * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-list-model.h b/src/gnome-list-model.h index 01775f52..3eb579da 100644 --- a/src/gnome-list-model.h +++ b/src/gnome-list-model.h @@ -1,8 +1,8 @@ /* GNOME libraries - abstract list model * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-list-selection-model.c b/src/gnome-list-selection-model.c index 4a5b8f13..f3395bcd 100644 --- a/src/gnome-list-selection-model.c +++ b/src/gnome-list-selection-model.c @@ -1,8 +1,8 @@ /* GNOME libraries - abstract list selection model * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-list-selection-model.h b/src/gnome-list-selection-model.h index 9391de5d..cb95fb47 100644 --- a/src/gnome-list-selection-model.h +++ b/src/gnome-list-selection-model.h @@ -1,8 +1,8 @@ /* GNOME libraries - abstract list selection model * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-list-view.c b/src/gnome-list-view.c index 0deaec04..e4e44ebd 100644 --- a/src/gnome-list-view.c +++ b/src/gnome-list-view.c @@ -1,8 +1,8 @@ /* GNOME libraries - abstract list view * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-list-view.h b/src/gnome-list-view.h index 19b42859..6e18c43a 100644 --- a/src/gnome-list-view.h +++ b/src/gnome-list-view.h @@ -1,8 +1,8 @@ /* GNOME libraries - abstract list view * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-position-list-model.c b/src/gnome-position-list-model.c index 4f41abd8..7bc4972b 100644 --- a/src/gnome-position-list-model.c +++ b/src/gnome-position-list-model.c @@ -1,8 +1,8 @@ /* GNOME libraries - abstract position list model * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-position-list-model.h b/src/gnome-position-list-model.h index 31695349..5e4ef85c 100644 --- a/src/gnome-position-list-model.h +++ b/src/gnome-position-list-model.h @@ -1,8 +1,8 @@ /* GNOME libraries - abstract position list model * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-wrap-list.c b/src/gnome-wrap-list.c index 4a6c15b1..479babec 100644 --- a/src/gnome-wrap-list.c +++ b/src/gnome-wrap-list.c @@ -1,8 +1,8 @@ /* GNOME libraries - abstract wrapped list view * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gnome-wrap-list.h b/src/gnome-wrap-list.h index 3745bae9..594f99bc 100644 --- a/src/gnome-wrap-list.h +++ b/src/gnome-wrap-list.h @@ -1,8 +1,8 @@ /* GNOME libraries - abstract wrapped list view * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/src/gtkscrollframe.c b/src/gtkscrollframe.c index 8bd71923..a607bb51 100644 --- a/src/gtkscrollframe.c +++ b/src/gtkscrollframe.c @@ -548,9 +548,12 @@ gtk_scroll_frame_size_request (GtkWidget *widget, GtkRequisition *requisition) gtk_widget_size_request (bin->child, &child_requisition); +#if 0 if (priv->hsb_policy == GTK_POLICY_NEVER) requisition->width += child_requisition.width; - else { + else +#endif + { GtkWidgetAuxInfo *aux_info; aux_info = gtk_object_get_data_by_id (GTK_OBJECT (bin->child), @@ -562,9 +565,12 @@ gtk_scroll_frame_size_request (GtkWidget *widget, GtkRequisition *requisition) requisition->width += vsb_requisition.width; } +#if 0 if (priv->vsb_policy == GTK_POLICY_NEVER) requisition->height += child_requisition.height; - else { + else +#endif + { GtkWidgetAuxInfo *aux_info; aux_info = gtk_object_get_data_by_id (GTK_OBJECT (bin->child), diff --git a/src/image-item.c b/src/image-item.c index 5c9c7896..bda80640 100644 --- a/src/image-item.c +++ b/src/image-item.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - image canvas item * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/image-item.h b/src/image-item.h index 8822e5cd..a6f67fa4 100644 --- a/src/image-item.h +++ b/src/image-item.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - image canvas item * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/image-view.c b/src/image-view.c index e532d4fb..cf365582 100644 --- a/src/image-view.c +++ b/src/image-view.c @@ -2,7 +2,7 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -290,10 +290,8 @@ image_view_init (ImageView *view) priv->client = gconf_client_get_default (); -#if 0 gconf_client_add_dir (priv->client, "/apps/eog", GCONF_CLIENT_PRELOAD_RECURSIVE, NULL); -#endif priv->interp_type_notify_id = gconf_client_notify_add ( priv->client, "/apps/eog/view/interp_type", @@ -395,9 +393,7 @@ image_view_destroy (GtkObject *object) priv->dither_notify_id = 0; priv->scroll_notify_id = 0; -#if 0 - gconf_client_remove_dir (priv->client, "/apps/eog"); -#endif + gconf_client_remove_dir (priv->client, "/apps/eog", NULL); /* Clean up */ @@ -1408,6 +1404,9 @@ image_view_key_press (GtkWidget *widget, GdkEventKey *event) xofs = yofs = 0; zoom = 1.0; + if ((event->state & (GDK_MODIFIER_MASK & ~GDK_LOCK_MASK)) != 0) + return FALSE; + switch (event->keyval) { case GDK_Up: do_scroll = TRUE; diff --git a/src/image-view.h b/src/image-view.h index 48ee8ed6..74fe1836 100644 --- a/src/image-view.h +++ b/src/image-view.h @@ -2,7 +2,7 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/image.c b/src/image.c index f2a07281..cabe82c0 100644 --- a/src/image.c +++ b/src/image.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - image structure and image loading * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/image.h b/src/image.h index 1f283b91..0b3d86a0 100644 --- a/src/image.h +++ b/src/image.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - image structure and image loading * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - main module, startup code * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/preferences.c b/src/preferences.c index 958a957e..f3b59b78 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -2,7 +2,8 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Authors: Federico Mena-Quintero <federico@gnu.org> + * Arik Devens <arik@helixcode.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/preferences.h b/src/preferences.h index e5d7a5cf..bc1a49c0 100644 --- a/src/preferences.h +++ b/src/preferences.h @@ -2,7 +2,8 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Authors: Federico Mena-Quintero <federico@gnu.org> + * Arik Devens <arik@helixcode.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/render.c b/src/render.c index b9c57ed8..a6fc70f6 100644 --- a/src/render.c +++ b/src/render.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - core rendering module * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/render.h b/src/render.h index 3fd44bdd..7830b362 100644 --- a/src/render.h +++ b/src/render.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - core rendering module * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/stock.c b/src/stock.c index 28c2bf68..e9443afb 100644 --- a/src/stock.c +++ b/src/stock.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - stock icons * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/stock.h b/src/stock.h index 74b8c2f0..2b7fa192 100644 --- a/src/stock.h +++ b/src/stock.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - stock icons * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/tb-image.c b/src/tb-image.c index 4c223975..4af444a3 100644 --- a/src/tb-image.c +++ b/src/tb-image.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - toolbar for image windows * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/tb-image.h b/src/tb-image.h index 94fcd917..067324bf 100644 --- a/src/tb-image.h +++ b/src/tb-image.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - toolbar for image windows * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/ui-image.c b/src/ui-image.c index 565eab50..80e79b59 100644 --- a/src/ui-image.c +++ b/src/ui-image.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - scrolling user interface for image views * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/ui-image.h b/src/ui-image.h index 66b08431..7649af8d 100644 --- a/src/ui-image.h +++ b/src/ui-image.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - user interface for image views * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2,7 +2,7 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2,7 +2,7 @@ * * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - miscellaneous utility functions * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - miscellaneous utility functions * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/window.c b/src/window.c index 66465f73..09d7df1f 100644 --- a/src/window.c +++ b/src/window.c @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - main window widget * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -142,7 +142,8 @@ about_cmd (GtkWidget *widget, gpointer data) { static GtkWidget *about; static const char *authors[] = { - "Federico Mena-Quintero (federico@gimp.org)", + "Federico Mena-Quintero (federico@gnu.org)", + "Arik Devens (arik@helixcode.com)", NULL }; @@ -150,7 +151,7 @@ about_cmd (GtkWidget *widget, gpointer data) about = gnome_about_new ( _("Eye of Gnome"), VERSION, - _("Copyright (C) 1999 The Free Software Foundation"), + _("Copyright (C) 2000 The Free Software Foundation"), authors, _("The GNOME image viewing and cataloging program"), NULL); @@ -327,10 +328,8 @@ window_init (Window *window) priv->client = gconf_client_get_default (); -#if 0 gconf_client_add_dir (priv->client, "/apps/eog", GCONF_CLIENT_PRELOAD_RECURSIVE, NULL); -#endif priv->sb_policy_notify_id = gconf_client_notify_add ( priv->client, "/apps/eog/window/sb_policy", @@ -373,9 +372,7 @@ window_destroy (GtkObject *object) priv->sb_policy_notify_id = 0; -#if 0 - gconf_client_remove_dir (priv->client, "/apps/eog"); -#endif + gconf_client_remove_dir (priv->client, "/apps/eog", NULL); gtk_object_unref (GTK_OBJECT (priv->client)); priv->client = NULL; diff --git a/src/window.h b/src/window.h index 19de589f..f86d07c6 100644 --- a/src/window.h +++ b/src/window.h @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - main window widget * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - utility functions for computing zoom factors * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1,8 +1,8 @@ /* Eye of Gnome image viewer - utility functions for computing zoom factors * - * Copyright (C) 1999 The Free Software Foundation + * Copyright (C) 2000 The Free Software Foundation * - * Author: Federico Mena-Quintero <federico@gimp.org> + * Author: Federico Mena-Quintero <federico@gnu.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |