[nautilus: 3/9] directory-view: call set_active() on subclasses to set insensitive bg
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus: 3/9] directory-view: call set_active() on subclasses to set insensitive bg
- Date: Sat, 9 Oct 2010 17:39:36 +0000 (UTC)
commit c31c5e360b0726788af93f6e404e1686d46b1f61
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Thu Oct 7 11:20:03 2010 +0200
directory-view: call set_active() on subclasses to set insensitive bg
Don't have a default implementation relying on EelBackground here.
src/file-manager/fm-directory-view.c | 33 ---------------------------------
src/file-manager/fm-directory-view.h | 1 -
2 files changed, 0 insertions(+), 34 deletions(-)
---
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 117485e..455afe2 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -39,7 +39,6 @@
#include "fm-properties-window.h"
#include "libnautilus-private/nautilus-open-with-dialog.h"
-#include <eel/eel-background.h>
#include <eel/eel-glib-extensions.h>
#include <eel/eel-gnome-extensions.h>
#include <eel/eel-gtk-extensions.h>
@@ -389,7 +388,6 @@ EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, can_zoom_in)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, can_zoom_out)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, clear)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, file_changed)
-EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_background_widget)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selection)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selection_for_file_transfer)
EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_item_count)
@@ -3495,32 +3493,6 @@ fm_directory_view_can_zoom_out (FMDirectoryView *view)
can_zoom_out, (view));
}
-GtkWidget *
-fm_directory_view_get_background_widget (FMDirectoryView *view)
-{
- g_return_val_if_fail (FM_IS_DIRECTORY_VIEW (view), NULL);
-
- return EEL_CALL_METHOD_WITH_RETURN_VALUE
- (FM_DIRECTORY_VIEW_CLASS, view,
- get_background_widget, (view));
-}
-
-EelBackground *
-fm_directory_view_get_background (FMDirectoryView *view)
-{
- return eel_get_widget_background (fm_directory_view_get_background_widget (view));
-}
-
-static void
-real_set_is_active (FMDirectoryView *view,
- gboolean is_active)
-{
- EelBackground *bg;
-
- bg = fm_directory_view_get_background (view);
- eel_background_set_active (bg, is_active);
-}
-
static void
fm_directory_view_set_is_active (FMDirectoryView *view,
gboolean is_active)
@@ -7401,9 +7373,6 @@ real_merge_menus (FMDirectoryView *view)
ui = nautilus_ui_string_get ("nautilus-directory-view-ui.xml");
view->details->dir_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL);
- g_signal_connect_object (fm_directory_view_get_background (view), "settings_changed",
- G_CALLBACK (schedule_update_menus), G_OBJECT (view),
- G_CONNECT_SWAPPED);
view->details->scripts_invalid = TRUE;
view->details->templates_invalid = TRUE;
@@ -10729,7 +10698,6 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
klass->merge_menus = real_merge_menus;
klass->unmerge_menus = real_unmerge_menus;
klass->update_menus = real_update_menus;
- klass->set_is_active = real_set_is_active;
/* Function pointers that subclasses must override */
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, add_file);
@@ -10738,7 +10706,6 @@ fm_directory_view_class_init (FMDirectoryViewClass *klass)
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, can_zoom_out);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, clear);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, file_changed);
- EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_background_widget);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_selection);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_selection_for_file_transfer);
EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, fm_directory_view, get_item_count);
diff --git a/src/file-manager/fm-directory-view.h b/src/file-manager/fm-directory-view.h
index 68754a9..6d12a26 100644
--- a/src/file-manager/fm-directory-view.h
+++ b/src/file-manager/fm-directory-view.h
@@ -417,7 +417,6 @@ char ** fm_directory_view_get_emblem_names_to_exclude (FMDirect
NautilusDirectory *fm_directory_view_get_model (FMDirectoryView *view);
GtkWindow *fm_directory_view_get_containing_window (FMDirectoryView *view);
NautilusFile *fm_directory_view_get_directory_as_file (FMDirectoryView *view);
-EelBackground * fm_directory_view_get_background (FMDirectoryView *view);
gboolean fm_directory_view_get_allow_moves (FMDirectoryView *view);
void fm_directory_view_pop_up_background_context_menu (FMDirectoryView *view,
GdkEventButton *event);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]