summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/eom-exif-details.c8
-rw-r--r--src/eom-jobs.c18
-rw-r--r--src/eom-list-store.c1
-rw-r--r--src/eom-preferences-dialog.c1
-rw-r--r--src/eom-print-preview.c5
-rw-r--r--src/eom-scroll-view.c2
-rw-r--r--src/eom-sidebar.c6
-rw-r--r--src/eom-window.c40
8 files changed, 13 insertions, 68 deletions
diff --git a/src/eom-exif-details.c b/src/eom-exif-details.c
index da571c6..643b1b7 100644
--- a/src/eom-exif-details.c
+++ b/src/eom-exif-details.c
@@ -459,12 +459,8 @@ eom_exif_details_reset (EomExifDetails *exif_details)
void
eom_exif_details_update (EomExifDetails *exif_details, ExifData *data)
{
- EomExifDetailsPrivate *priv;
-
g_return_if_fail (EOM_IS_EXIF_DETAILS (exif_details));
- priv = exif_details->priv;
-
eom_exif_details_reset (exif_details);
if (data) {
exif_data_foreach_content (data, exif_content_cb, exif_details);
@@ -547,12 +543,8 @@ xmp_entry_insert (EomExifDetails *view, XmpStringPtr xmp_schema,
void
eom_exif_details_xmp_update (EomExifDetails *view, XmpPtr data)
{
- EomExifDetailsPrivate *priv;
-
g_return_if_fail (EOM_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/eom-jobs.c b/src/eom-jobs.c
index d5a7a1d..cba47f9 100644
--- a/src/eom-jobs.c
+++ b/src/eom-jobs.c
@@ -346,23 +346,8 @@ eom_job_load_run (EomJob *job)
static void eom_job_model_init (EomJobModel *job) { /* Do Nothing */ }
static void
-eom_job_model_dispose (GObject *object)
-{
- EomJobModel *job;
-
- job = EOM_JOB_MODEL (object);
-
- (* G_OBJECT_CLASS (eom_job_model_parent_class)->dispose) (object);
-}
-
-static void
eom_job_model_class_init (EomJobModelClass *class)
{
- GObjectClass *oclass;
-
- oclass = G_OBJECT_CLASS (class);
-
- oclass->dispose = eom_job_model_dispose;
EOM_JOB_CLASS (class)->run = eom_job_model_run;
}
@@ -880,7 +865,6 @@ eom_job_copy_run (EomJob *ejob)
{
EomJobCopy *job;
GList *it;
- guint n_images;
GFile *src, *dest;
gchar *filename, *dest_filename;
@@ -888,8 +872,6 @@ eom_job_copy_run (EomJob *ejob)
job = EOM_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/eom-list-store.c b/src/eom-list-store.c
index 445c01e..0e790e7 100644
--- a/src/eom-list-store.c
+++ b/src/eom-list-store.c
@@ -463,6 +463,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/eom-preferences-dialog.c b/src/eom-preferences-dialog.c
index 869c6eb..c90d9f1 100644
--- a/src/eom-preferences-dialog.c
+++ b/src/eom-preferences-dialog.c
@@ -154,7 +154,6 @@ eom_preferences_dialog_constructor (GType type,
GtkWidget *plugin_manager;
GtkWidget *plugin_manager_container;
GObject *object;
- GdkColor color;
object = G_OBJECT_CLASS (eom_preferences_dialog_parent_class)->constructor
(type, n_construct_properties, construct_params);
diff --git a/src/eom-print-preview.c b/src/eom-print-preview.c
index 8839eaa..3986df1 100644
--- a/src/eom-print-preview.c
+++ b/src/eom-print-preview.c
@@ -566,13 +566,11 @@ expose_event_cb (GtkDrawingArea *drawing_area,
gpointer user_data)
{
GtkWidget *widget;
- EomPrintPreviewPrivate *priv;
#if !GTK_CHECK_VERSION (3, 0, 0)
cairo_t *cr;
#endif
widget = GTK_WIDGET (drawing_area);
- priv = EOM_PRINT_PREVIEW (user_data)->priv;
update_relative_sizes (EOM_PRINT_PREVIEW (user_data));
@@ -882,13 +880,10 @@ key_press_event_cb (GtkWidget *widget,
GdkEventKey *event,
gpointer user_data)
{
- EomPrintPreviewPrivate *priv;
gfloat delta, align;
gboolean stop_emission = FALSE;
const gchar *property;
- priv = EOM_PRINT_PREVIEW (user_data)->priv;
-
delta = 0;
switch (event->keyval) {
diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c
index d1d22c5..61e2c29 100644
--- a/src/eom-scroll-view.c
+++ b/src/eom-scroll-view.c
@@ -2664,12 +2664,10 @@ eom_scroll_view_set_property (GObject *object, guint property_id,
const GValue *value, GParamSpec *pspec)
{
EomScrollView *view;
- EomScrollViewPrivate *priv;
g_return_if_fail (EOM_IS_SCROLL_VIEW (object));
view = EOM_SCROLL_VIEW (object);
- priv = view->priv;
switch (property_id) {
case PROP_ANTIALIAS_IN:
diff --git a/src/eom-sidebar.c b/src/eom-sidebar.c
index a8a3e40..0818bd0 100644
--- a/src/eom-sidebar.c
+++ b/src/eom-sidebar.c
@@ -188,14 +188,16 @@ static void
eom_sidebar_class_init (EomSidebarClass *eom_sidebar_class)
{
GObjectClass *g_object_class;
+#if GTK_CHECK_VERSION(3, 0, 0)
GtkWidgetClass *widget_class;
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#else
GtkObjectClass *gtk_object_klass;
#endif
g_object_class = G_OBJECT_CLASS (eom_sidebar_class);
+#if GTK_CHECK_VERSION(3, 0, 0)
widget_class = GTK_WIDGET_CLASS (eom_sidebar_class);
-#if !GTK_CHECK_VERSION(3, 0, 0)
+#else
gtk_object_klass = GTK_OBJECT_CLASS (eom_sidebar_class);
#endif
diff --git a/src/eom-window.c b/src/eom-window.c
index 3967ad9..e6b28f3 100644
--- a/src/eom-window.c
+++ b/src/eom-window.c
@@ -330,7 +330,7 @@ eom_window_set_collection_mode (EomWindow *window, EomWindowCollectionPos positi
eom_thumb_nav_set_mode (EOM_THUMB_NAV (priv->nav), mode);
- if (priv->mode != EOM_WINDOW_STATUS_UNKNOWN) {
+ if (priv->mode != EOM_WINDOW_MODE_UNKNOWN) {
update_action_groups_state (window);
}
}
@@ -388,7 +388,6 @@ eom_window_get_display_profile (GdkScreen *screen)
int result;
cmsHPROFILE *profile;
char *atom_name;
- int lcms_error_action;
dpy = GDK_DISPLAY_XDISPLAY (gdk_screen_get_display (screen));
@@ -2672,7 +2671,6 @@ wallpaper_info_bar_response (GtkInfoBar *bar, gint response, EomWindow *window)
static void
eom_window_set_wallpaper (EomWindow *window, const gchar *filename, const gchar *visible_filename)
{
- EomWindowPrivate *priv = EOM_WINDOW_GET_PRIVATE (window);
GtkWidget *info_bar;
GtkWidget *image;
GtkWidget *label;
@@ -4929,20 +4927,7 @@ eom_window_button_press (GtkWidget *widget, GdkEventButton *event)
return result;
}
-static gboolean
-eom_window_configure_event (GtkWidget *widget, GdkEventConfigure *event)
-{
- EomWindow *window;
-
- g_return_val_if_fail (EOM_IS_WINDOW (widget), TRUE);
-
- window = EOM_WINDOW (widget);
-
- GTK_WIDGET_CLASS (eom_window_parent_class)->configure_event (widget, event);
-
- return FALSE;
-}
-
+#if !GTK_CHECK_VERSION (3, 0, 0)
static gboolean
eom_window_window_state_event (GtkWidget *widget,
GdkEventWindowState *event)
@@ -4959,23 +4944,14 @@ eom_window_window_state_event (GtkWidget *widget,
show = !(event->new_window_state &
(GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN));
+
+ eom_statusbar_set_has_resize_grip (EOM_STATUSBAR (window->priv->statusbar),
+ show);
}
return FALSE;
}
-
-static void
-eom_window_unrealize (GtkWidget *widget)
-{
- EomWindow *window;
-
- g_return_if_fail (EOM_IS_WINDOW (widget));
-
- window = EOM_WINDOW (widget);
-
- GTK_WIDGET_CLASS (eom_window_parent_class)->unrealize (widget);
-}
-
+#endif
static gboolean
eom_window_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
@@ -5091,9 +5067,9 @@ eom_window_class_init (EomWindowClass *class)
widget_class->key_press_event = eom_window_key_press;
widget_class->button_press_event = eom_window_button_press;
widget_class->drag_data_received = eom_window_drag_data_received;
- widget_class->configure_event = eom_window_configure_event;
+#if !GTK_CHECK_VERSION (3, 0, 0)
widget_class->window_state_event = eom_window_window_state_event;
- widget_class->unrealize = eom_window_unrealize;
+#endif
widget_class->focus_out_event = eom_window_focus_out_event;
/**
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 17:54:15 +0000