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

several build warning fixes (Fixes bug #318020).

Browse source 
2005-11-03  Lucas Rocha  <lucasr@cvs.gnome.org>

        * libeog/eog-image.c, libeog/eog-scroll-view.c,
        libeog/eog-thumbnail.c, shell/eog-preferences.c,
        shell/eog-window.c, shell/main.c: several build warning
        fixes (Fixes bug #318020).
This commit is contained in:
Lucas Rocha 2005-11-03 03:53:20 +00:00 committed by Lucas Almeida Rocha
parent 0b380a5201
commit 7a0112df56
7 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-11-03 Lucas Rocha <lucasr@cvs.gnome.org>
* libeog/eog-image.c, libeog/eog-scroll-view.c,
libeog/eog-thumbnail.c, shell/eog-preferences.c,
shell/eog-window.c, shell/main.c: several build warning
fixes (Fixes bug #318020).
2005-11-01 Lucas Rocha <lucasr@cvs.gnome.org>
* libeog/eog-full-screen.c: make F9 key only cancel slide

4
libeog/eog-image.c
View file

@ -1780,8 +1780,8 @@ vfs_monitor_dir_cb (GnomeVFSMonitorHandle *handle,
gpointer user_data)
{
VfsFileCbContext *ctx = user_data;
gchar *monitor_ptr = monitor_uri;
gchar *info_ptr = info_uri;
gchar *monitor_ptr = (gchar *) monitor_uri;
gchar *info_ptr = (gchar *) info_uri;
monitor_ptr += 7;
info_ptr += 7;

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

@ -388,6 +388,7 @@ is_image_movable (EogScrollView *view)
/* Computes the image offsets with respect to the window */
/*
static void
get_image_offsets (EogScrollView *view, int *xofs, int *yofs)
{
@ -402,7 +403,7 @@ get_image_offsets (EogScrollView *view, int *xofs, int *yofs)
width = GTK_WIDGET (priv->display)->allocation.width;
height = GTK_WIDGET (priv->display)->allocation.height;
/* Compute image offsets with respect to the window */
// Compute image offsets with respect to the window
if (scaled_width <= width)
*xofs = (width - scaled_width) / 2;
else
@ -413,8 +414,8 @@ get_image_offsets (EogScrollView *view, int *xofs, int *yofs)
else
*yofs = -priv->yofs;
}
*/
/*===================================
drawing core
---------------------------------*/
@ -1402,7 +1403,7 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
image loading callbacks
-----------------------------------*/
/*
static void
image_loading_update_cb (EogImage *img, int x, int y, int width, int height, gpointer data)
{
@ -1463,7 +1464,7 @@ image_loading_finished_cb (EogImage *img, gpointer data)
else if (priv->interp_type != GDK_INTERP_NEAREST &&
!is_unity_zoom (view))
{
/* paint antialiased image version */
// paint antialiased image version
priv->progressive_state = PROGRESSIVE_POLISHING;
gtk_widget_queue_draw (GTK_WIDGET (priv->display));
}
@ -1504,7 +1505,7 @@ image_loading_cancelled_cb (EogImage *img, gpointer data)
gdk_window_clear (GTK_WIDGET (priv->display)->window);
}
}
*/
static void
image_changed_cb (EogImage *img, gpointer data)
{

1
libeog/eog-thumbnail.c
View file

@ -56,7 +56,6 @@ set_thumb_error (GError **error, int error_id, const char *string)
static GdkPixbuf*
get_valid_thumbnail (EogThumbData *data, GError **error)
{
char *uri_str = NULL;
GdkPixbuf *thumb = NULL;
g_return_val_if_fail (data != NULL, NULL);

1
shell/eog-preferences.c
View file

@ -2,6 +2,7 @@
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <glib/gi18n.h>
#include <libgnome/gnome-help.h>
#include "util.h"
#include "eog-preferences.h"
#include "eog-config-keys.h"

8
shell/eog-window.c
View file

@ -3300,8 +3300,8 @@ eog_window_construct_ui (EogWindow *window, GError **error)
GtkWidget *frame;
char *filename;
guint merge_id;
GtkAdjustment *vadj;
GtkAdjustment *hadj;
GtkObject *vadj;
GtkObject *hadj;
g_return_val_if_fail (window != NULL, FALSE);
g_return_val_if_fail (EOG_IS_WINDOW (window), FALSE);
@ -3424,7 +3424,8 @@ eog_window_construct_ui (EogWindow *window, GError **error)
vadj = gtk_adjustment_new (0, 100, 0, 10, 10, 100);
hadj = gtk_adjustment_new (0, 100, 0, 10, 10, 100);
sw = gtk_scrolled_window_new (hadj, vadj);
sw = gtk_scrolled_window_new (GTK_ADJUSTMENT (hadj),
GTK_ADJUSTMENT (vadj));
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
@ -3649,7 +3650,6 @@ gboolean
eog_window_open (EogWindow *window, EogImageList *model, GError **error)
{
EogWindowPrivate *priv;
int i;
g_return_val_if_fail (EOG_IS_WINDOW (window), FALSE);

1
shell/main.c
View file

@ -672,7 +672,6 @@ main (int argc, char **argv)
GnomeProgram *program;
poptContext ctx;
GnomeClient *client;
char *gnome_eog_png_path;
bindtextdomain (PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (PACKAGE, "UTF-8");