[eog] all: fix build warnings with GCC 4.6
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog] all: fix build warnings with GCC 4.6
- Date: Fri, 4 Feb 2011 20:40:08 +0000 (UTC)
commit 3859553433838e97367e7678f9da4ba2bcc7f973
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Fri Feb 4 12:00:14 2011 -0500
all: fix build warnings with GCC 4.6
https://bugzilla.gnome.org/show_bug.cgi?id=641519
cut-n-paste/toolbar-editor/egg-toolbars-model.c | 2 +-
src/eog-exif-details.c | 8 ------
src/eog-jobs.c | 19 --------------
src/eog-list-store.c | 1 +
src/eog-print-preview.c | 5 ---
src/eog-scroll-view.c | 6 ----
src/eog-window.c | 31 +----------------------
7 files changed, 3 insertions(+), 69 deletions(-)
---
diff --git a/cut-n-paste/toolbar-editor/egg-toolbars-model.c b/cut-n-paste/toolbar-editor/egg-toolbars-model.c
index c2e8c17..95b2068 100644
--- a/cut-n-paste/toolbar-editor/egg-toolbars-model.c
+++ b/cut-n-paste/toolbar-editor/egg-toolbars-model.c
@@ -675,7 +675,7 @@ static void
egg_toolbars_model_class_init (EggToolbarsModelClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- volatile GType flags_type; /* work around gcc's optimiser */
+ volatile GType flags_type G_GNUC_UNUSED; /* work around gcc's optimiser */
/* make sure the flags type is known */
flags_type = EGG_TYPE_TB_MODEL_FLAGS;
diff --git a/src/eog-exif-details.c b/src/eog-exif-details.c
index d4823d2..b1c2516 100644
--- a/src/eog-exif-details.c
+++ b/src/eog-exif-details.c
@@ -459,12 +459,8 @@ eog_exif_details_reset (EogExifDetails *exif_details)
void
eog_exif_details_update (EogExifDetails *exif_details, ExifData *data)
{
- EogExifDetailsPrivate *priv;
-
g_return_if_fail (EOG_IS_EXIF_DETAILS (exif_details));
- priv = exif_details->priv;
-
eog_exif_details_reset (exif_details);
if (data) {
exif_data_foreach_content (data, exif_content_cb, exif_details);
@@ -547,12 +543,8 @@ xmp_entry_insert (EogExifDetails *view, XmpStringPtr xmp_schema,
void
eog_exif_details_xmp_update (EogExifDetails *view, XmpPtr data)
{
- EogExifDetailsPrivate *priv;
-
g_return_if_fail (EOG_IS_EXIF_DETAILS (view));
- priv = view->priv;
-
if (data) {
XmpIteratorPtr iter = xmp_iterator_new(data, NULL, NULL, XMP_ITER_JUSTLEAFNODES);
XmpStringPtr the_schema = xmp_string_new ();
diff --git a/src/eog-jobs.c b/src/eog-jobs.c
index 2a02e33..f10d784 100644
--- a/src/eog-jobs.c
+++ b/src/eog-jobs.c
@@ -344,23 +344,8 @@ eog_job_load_run (EogJob *job)
static void eog_job_model_init (EogJobModel *job) { /* Do Nothing */ }
static void
-eog_job_model_dispose (GObject *object)
-{
- EogJobModel *job;
-
- job = EOG_JOB_MODEL (object);
-
- (* G_OBJECT_CLASS (eog_job_model_parent_class)->dispose) (object);
-}
-
-static void
eog_job_model_class_init (EogJobModelClass *class)
{
- GObjectClass *oclass;
-
- oclass = G_OBJECT_CLASS (class);
-
- oclass->dispose = eog_job_model_dispose;
EOG_JOB_CLASS (class)->run = eog_job_model_run;
}
@@ -879,16 +864,12 @@ eog_job_copy_run (EogJob *ejob)
{
EogJobCopy *job;
GList *it;
- guint n_images;
GFile *src, *dest;
gchar *filename, *dest_filename;
g_return_if_fail (EOG_IS_JOB_COPY (ejob));
job = EOG_JOB_COPY (ejob);
-
- n_images = g_list_length (job->images);
-
job->current_pos = 0;
for (it = job->images; it != NULL; it = g_list_next (it), job->current_pos++) {
diff --git a/src/eog-list-store.c b/src/eog-list-store.c
index 46870ee..8e26021 100644
--- a/src/eog-list-store.c
+++ b/src/eog-list-store.c
@@ -448,6 +448,7 @@ file_monitor_changed_cb (GFileMonitor *monitor,
case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
case G_FILE_MONITOR_EVENT_UNMOUNTED:
+ case G_FILE_MONITOR_EVENT_MOVED:
break;
}
}
diff --git a/src/eog-print-preview.c b/src/eog-print-preview.c
index 608ed71..0c6d60f 100644
--- a/src/eog-print-preview.c
+++ b/src/eog-print-preview.c
@@ -551,10 +551,8 @@ draw_cb (GtkDrawingArea *drawing_area,
gpointer user_data)
{
GtkWidget *widget;
- EogPrintPreviewPrivate *priv;
widget = GTK_WIDGET (drawing_area);
- priv = EOG_PRINT_PREVIEW (user_data)->priv;
update_relative_sizes (EOG_PRINT_PREVIEW (user_data));
@@ -854,13 +852,10 @@ key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
gpointer user_data)
{
- EogPrintPreviewPrivate *priv;
gfloat delta, align;
gboolean stop_emission = FALSE;
const gchar *property;
- priv = EOG_PRINT_PREVIEW (user_data)->priv;
-
delta = 0;
switch (event->keyval) {
diff --git a/src/eog-scroll-view.c b/src/eog-scroll-view.c
index 33c9aa9..feae49b 100644
--- a/src/eog-scroll-view.c
+++ b/src/eog-scroll-view.c
@@ -2017,10 +2017,6 @@ update_pixbuf (EogScrollView *view, GdkPixbuf *pixbuf)
static void
image_changed_cb (EogImage *img, gpointer data)
{
- EogScrollViewPrivate *priv;
-
- priv = EOG_SCROLL_VIEW (data)->priv;
-
update_pixbuf (EOG_SCROLL_VIEW (data), eog_image_get_pixbuf (img));
_set_zoom_mode_internal (EOG_SCROLL_VIEW (data),
@@ -2628,12 +2624,10 @@ eog_scroll_view_set_property (GObject *object, guint property_id,
const GValue *value, GParamSpec *pspec)
{
EogScrollView *view;
- EogScrollViewPrivate *priv;
g_return_if_fail (EOG_IS_SCROLL_VIEW (object));
view = EOG_SCROLL_VIEW (object);
- priv = view->priv;
switch (property_id) {
case PROP_ANTIALIAS_IN:
diff --git a/src/eog-window.c b/src/eog-window.c
index c892fa5..bf9c8b0 100644
--- a/src/eog-window.c
+++ b/src/eog-window.c
@@ -339,7 +339,7 @@ eog_window_set_gallery_mode (EogWindow *window,
eog_thumb_nav_set_mode (EOG_THUMB_NAV (priv->nav), mode);
- if (priv->mode != EOG_WINDOW_STATUS_UNKNOWN) {
+ if (priv->mode != EOG_WINDOW_MODE_UNKNOWN) {
update_action_groups_state (window);
}
}
@@ -4956,33 +4956,6 @@ eog_window_button_press (GtkWidget *widget, GdkEventButton *event)
}
static gboolean
-eog_window_configure_event (GtkWidget *widget, GdkEventConfigure *event)
-{
- EogWindow *window;
-
- g_return_val_if_fail (EOG_IS_WINDOW (widget), TRUE);
-
- window = EOG_WINDOW (widget);
-
- GTK_WIDGET_CLASS (eog_window_parent_class)->configure_event (widget, event);
-
- return FALSE;
-}
-
-static void
-eog_window_unrealize (GtkWidget *widget)
-{
- EogWindow *window;
-
- g_return_if_fail (EOG_IS_WINDOW (widget));
-
- window = EOG_WINDOW (widget);
-
- GTK_WIDGET_CLASS (eog_window_parent_class)->unrealize (widget);
-}
-
-
-static gboolean
eog_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
{
EogWindow *window = EOG_WINDOW (widget);
@@ -5125,8 +5098,6 @@ eog_window_class_init (EogWindowClass *class)
widget_class->key_press_event = eog_window_key_press;
widget_class->button_press_event = eog_window_button_press;
widget_class->drag_data_received = eog_window_drag_data_received;
- widget_class->configure_event = eog_window_configure_event;
- widget_class->unrealize = eog_window_unrealize;
widget_class->focus_out_event = eog_window_focus_out_event;
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]