diff options
| author | monsta <[email protected]> | 2016-02-01 15:59:24 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-02-01 16:12:10 +0300 |
| commit | 83cd3ac26d0f937d625a228a564bd735fae568b2 (patch) | |
| tree | c87cd90739f9b2f20b99b1e96eb92db8bce205ce | |
| parent | be98824189cc7d5aea0ac4473e49ea42eb687d78 (diff) | |
| download | eom-83cd3ac26d0f937d625a228a564bd735fae568b2.tar.bz2 eom-83cd3ac26d0f937d625a228a564bd735fae568b2.tar.xz | |
fix build warnings and remove useless nested #if
| -rw-r--r-- | src/eom-list-store.c | 5 | ||||
| -rw-r--r-- | src/eom-preferences-dialog.c | 6 | ||||
| -rw-r--r-- | src/eom-thumb-view.c | 6 |
3 files changed, 5 insertions, 12 deletions
diff --git a/src/eom-list-store.c b/src/eom-list-store.c index e379b09..d60df91 100644 --- a/src/eom-list-store.c +++ b/src/eom-list-store.c @@ -460,10 +460,7 @@ file_monitor_changed_cb (GFileMonitor *monitor, } g_object_unref (file_info); break; - 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: + default: break; } } diff --git a/src/eom-preferences-dialog.c b/src/eom-preferences-dialog.c index c90d9f1..076f583 100644 --- a/src/eom-preferences-dialog.c +++ b/src/eom-preferences-dialog.c @@ -314,13 +314,15 @@ eom_preferences_dialog_constructor (GType type, } static void -eom_preferences_dialog_dispose (EomPreferencesDialog *pref_dlg) +eom_preferences_dialog_dispose (GObject *object) { - pref_dlg->priv = EOM_PREFERENCES_DIALOG_GET_PRIVATE (pref_dlg); + EomPreferencesDialog *pref_dlg = EOM_PREFERENCES_DIALOG (object); g_object_unref (pref_dlg->priv->view_settings); g_object_unref (pref_dlg->priv->fullscreen_settings); g_object_unref (pref_dlg->priv->ui_settings); + + G_OBJECT_CLASS (eom_preferences_dialog_parent_class)->dispose (object); } static void diff --git a/src/eom-thumb-view.c b/src/eom-thumb-view.c index 7eabe9d..f3cea08 100644 --- a/src/eom-thumb-view.c +++ b/src/eom-thumb-view.c @@ -206,9 +206,7 @@ eom_thumb_view_dispose (GObject *object) static void eom_thumb_view_finalize (GObject *object) { - EomThumbView *thumbview; g_return_if_fail (EOM_IS_THUMB_VIEW (object)); - thumbview = EOM_THUMB_VIEW (object); G_OBJECT_CLASS (eom_thumb_view_parent_class)->finalize (object); } @@ -220,9 +218,7 @@ eom_thumb_view_destroy (GtkWidget *object) eom_thumb_view_destroy (GtkObject *object) #endif { - EomThumbView *thumbview; g_return_if_fail (EOM_IS_THUMB_VIEW (object)); - thumbview = EOM_THUMB_VIEW (object); #if GTK_CHECK_VERSION(3, 0, 0) GTK_WIDGET_CLASS (eom_thumb_view_parent_class)->destroy (object); @@ -264,9 +260,7 @@ eom_thumb_view_set_property (GObject *object, { case PROP_ORIENTATION: view->priv->orientation = g_value_get_enum (value); -#if GTK_CHECK_VERSION (3, 4, 3) eom_thumb_view_update_columns (view); -#endif break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); |