graphics/eog
graphics/eog
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/eog synced 2024-10-18 14:04:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply patch from Kjartan Maraas <kmaraas@gnome.org>: config.h has to be

Browse source 
2005-06-23  Tim Gerla  <tim@gerla.net>

        * libeog/*.c, shell/*.c:
        Apply patch from Kjartan Maraas <kmaraas@gnome.org>:
        config.h has to be the first file included in a .c file and
        it must not be included more than once else you get undefined
        behaviour and broken translations etc. This patch fixes this up,
        along with a couple of other minor memory-management bugs.

CVl: ----------------------------------------------------------------------
This commit is contained in:
Tim Gerla 2005-06-23 23:15:17 +00:00 committed by Tim P. Gerla
parent a0de6410b0
commit 268d4afc02
29 changed files with 107 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-06-23 Tim Gerla <tim@gerla.net>
* libeog/*.c, shell/*.c:
Apply patch from Kjartan Maraas <kmaraas@gnome.org>:
config.h has to be the first file included in a .c file and
it must not be included more than once else you get undefined
behaviour and broken translations etc. This patch fixes this up,
along with a couple of other minor memory-management bugs.
2005-06-22 Kjartan Maraas <kmaraas@gnome.org>
* configure.in: Bump version to 2.11.x

3
libeog/accessible-image-view-factory.c
View file

@ -17,6 +17,9 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <gtk/gtkaccessible.h>
#include "accessible-image-view-factory.h"
#include "accessible-image-view.h"

4
libeog/accessible-image-view.c
View file

@ -17,6 +17,10 @@
*
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <stdio.h>
#include <string.h>
#include <gtk/gtk.h>

4
libeog/eog-canvas-pixbuf.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <math.h>
#include <libgnome/gnome-macros.h>
#include <libgnomecanvas/gnome-canvas.h>

8
libeog/eog-collection-item.c
View file

@ -1,3 +1,6 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include <libgnome/gnome-program.h>
#include <libgnome/gnome-macros.h>
@ -462,12 +465,15 @@ ensure_max_string_width (gchar *str, PangoLayout *layout, int max_width)
else {
char *tail;
char *rest;
char *tmp;
/* split remaining rest of string */
tail = g_utf8_offset_to_pointer (str, i+1);
rest = ensure_max_string_width (tail, layout, max_width);
tmp = g_strndup (str, (tail - str));
result = g_strconcat (g_strndup (str, (tail - str)), "\n", rest, NULL);
result = g_strconcat ((tmp), "\n", rest, NULL);
g_free (tmp);
g_free (rest);
}

3
libeog/eog-hig-dialog.c
View file

@ -1,3 +1,6 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include <gtk/gtk.h>
#include <libgnome/gnome-macros.h>

5
libeog/eog-image-cache.c
View file

@ -1,5 +1,8 @@
#include <libgnome/gnome-macros.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <libgnome/gnome-macros.h>
#include "eog-image-cache.h"
struct _EogImageCachePrivate {

4
libeog/eog-image-jpeg.c
View file

@ -28,6 +28,10 @@
* Boston, MA 02111-1307, USA.
*/
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "eog-image-jpeg.h"
#if HAVE_JPEG

2
libeog/eog-image-jpeg.h
View file

@ -1,8 +1,6 @@
#ifndef _EOG_IMAGE_JPEG_H_
#define _EOG_IMAGE_JPEG_H_
#include <config.h>
#if HAVE_JPEG
#include <glib.h>

4
libeog/eog-image-list.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include <libgnome/gnome-macros.h>
#include <glib/gi18n.h>

4
libeog/eog-image-save-info.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include <libgnome/gnome-macros.h>
#include <libgnomevfs/gnome-vfs.h>

4
libeog/eog-info-view-detail.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <libgnome/gnome-macros.h>
#include "eog-info-view-detail.h"

4
libeog/eog-info-view-exif.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <libgnome/gnome-macros.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>

2
libeog/eog-info-view-exif.h
View file

@ -1,8 +1,6 @@
#ifndef _EOG_INFO_VIEW_EXIF_H_
#define _EOG_INFO_VIEW_EXIF_H_
#include <config.h>
#if HAVE_EXIF
#include <glib-object.h>

4
libeog/eog-info-view-file.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <libgnome/gnome-macros.h>
#include <libgnomevfs/gnome-vfs-utils.h>
#include <glib/gi18n.h>

4
libeog/eog-job-manager.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include "eog-job-manager.h"
typedef struct {

4
libeog/eog-job.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <libgnome/gnome-macros.h>
#include "eog-job.h"

4
libeog/eog-metadata-reader.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include <libgnome/gnome-macros.h>

1
libeog/eog-metadata-reader.h
View file

@ -1,7 +1,6 @@
#ifndef _EOG_METADATA_READER_H_
#define _EOG_METADATA_READER_H_
#include <config.h>
#include <glib-object.h>
#if HAVE_EXIF
#include <libexif/exif-data.h>

4
libeog/eog-pixbuf-util.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include "eog-pixbuf-util.h"

4
libeog/eog-save-as-dialog-helper.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include <stdlib.h>
#include <libgnomeui/gnome-client.h>

4
libeog/eog-save-dialog-helper.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <glade/glade.h>
#include <libgnome/gnome-program.h>
#include <glib/gi18n.h>

4
libeog/eog-scroll-view.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <math.h>
#include <libgnome/gnome-macros.h>
#include <gdk-pixbuf/gdk-pixbuf.h>

4
libeog/eog-thumbnail.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <libgnomeui/libgnomeui.h>
#include "eog-thumbnail.h"

4
libeog/eog-transform.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <time.h>
#include <stdlib.h>
#include <math.h>

4
libeog/eog-uri-converter.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <math.h>
#include <string.h>
#include <libgnome/gnome-macros.h>

4
libeog/eog-util.c
View file

@ -1,3 +1,7 @@
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <string.h>
#include <glib.h>
#include <glib/gi18n.h>

1
shell/eog-preferences.c
View file

@ -1,3 +1,4 @@
#include <config.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <libgnomeui/libgnomeui.h>

7
shell/eog-window.c
View file

@ -20,10 +20,10 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*/
#include <config.h>
#include <sys/types.h>
#include <dirent.h>
#include <errno.h>
#include <config.h>
#include <math.h>
#include <time.h>
#include <unistd.h>
@ -2619,8 +2619,9 @@ update_status_bar (EogWindow *window)
nsel = eog_wrap_list_get_n_selected (EOG_WRAP_LIST (priv->wraplist));
/* Images: (n_selected_images) / (n_total_images) */
n_img_str = g_strdup_printf ("%i / %i", nsel, nimg);
}
gtk_label_set_text (GTK_LABEL (priv->n_img_label), n_img_str);
gtk_label_set_text (GTK_LABEL (priv->n_img_label), n_img_str);
g_free (n_img_str);
}
if (priv->displayed_image != NULL) {
int zoom, width, height;