[seahorse] Remove SeahorseView::get_current_set() virtual method.



commit 9fc6e666e03a85aea07cd391fc3c55132ea63490
Author: Stef Walter <stefw collabora co uk>
Date:   Fri Sep 2 11:34:36 2011 +0200

    Remove SeahorseView::get_current_set() virtual method.
    
     * Unneeded

 libseahorse/seahorse-view.c |   15 +--------------
 libseahorse/seahorse-view.h |    6 +-----
 src/seahorse-viewer.c       |   20 +-------------------
 src/seahorse-viewer.h       |    6 +-----
 4 files changed, 4 insertions(+), 43 deletions(-)
---
diff --git a/libseahorse/seahorse-view.c b/libseahorse/seahorse-view.c
index 9e4daf2..5da6e16 100644
--- a/libseahorse/seahorse-view.c
+++ b/libseahorse/seahorse-view.c
@@ -59,15 +59,6 @@ seahorse_view_set_selected (SeahorseView* self, SeahorseObject* value)
 	SEAHORSE_VIEW_GET_INTERFACE (self)->set_selected (self, value);
 }
 
-
-SeahorseSet* 
-seahorse_view_get_current_set (SeahorseView* self) 
-{
-	g_return_val_if_fail (SEAHORSE_VIEW_GET_INTERFACE (self)->get_current_set, NULL);
-	return SEAHORSE_VIEW_GET_INTERFACE (self)->get_current_set (self);
-}
-
-
 GtkWindow* 
 seahorse_view_get_window (SeahorseView* self) 
 {
@@ -100,11 +91,7 @@ seahorse_view_base_init (SeahorseViewIface * iface)
 		g_object_interface_install_property (iface, 
 		         g_param_spec_object ("selected", "selected", "selected", 
 		                              SEAHORSE_TYPE_OBJECT, G_PARAM_READWRITE));
-		
-		g_object_interface_install_property (iface, 
-		         g_param_spec_object ("current-set", "current-set", "current-set", 
-		                              SEAHORSE_TYPE_SET, G_PARAM_READABLE));
-		
+
 		g_object_interface_install_property (iface, 
 		         g_param_spec_object ("window", "window", "window", 
 		                              GTK_TYPE_WINDOW, G_PARAM_READABLE));
diff --git a/libseahorse/seahorse-view.h b/libseahorse/seahorse-view.h
index 33f784e..5c277e0 100644
--- a/libseahorse/seahorse-view.h
+++ b/libseahorse/seahorse-view.h
@@ -54,9 +54,7 @@ struct _SeahorseViewIface {
 	
 	void            (*set_selected)           (SeahorseView *self, 
 	                                           SeahorseObject *value);
-	
-	SeahorseSet*    (*get_current_set)        (SeahorseView *self);
-	
+
 	GtkWindow*      (*get_window)             (SeahorseView *self);
 	
 	void            (*register_commands)      (SeahorseView *self, 
@@ -85,8 +83,6 @@ SeahorseObject*   seahorse_view_get_selected                (SeahorseView *self)
 void              seahorse_view_set_selected                (SeahorseView *self, 
                                                              SeahorseObject *value);
 
-SeahorseSet*      seahorse_view_get_current_set             (SeahorseView *self);
-
 GtkWindow*        seahorse_view_get_window                  (SeahorseView *self);
 
 void              seahorse_view_register_ui                 (SeahorseView *self, 
diff --git a/src/seahorse-viewer.c b/src/seahorse-viewer.c
index ed0331d..b8761ec 100644
--- a/src/seahorse-viewer.c
+++ b/src/seahorse-viewer.c
@@ -39,7 +39,6 @@
 enum {
 	PROP_0,
 	PROP_SELECTED,
-	PROP_CURRENT_SET,
 	PROP_WINDOW
 };
 
@@ -761,9 +760,6 @@ seahorse_viewer_get_property (GObject *obj, guint prop_id, GValue *value,
 	case PROP_SELECTED:
 		g_value_set_object (value, seahorse_viewer_get_selected (self));
 		break;
-	case PROP_CURRENT_SET:
-		g_value_set_object (value, seahorse_viewer_get_current_set (self));
-		break;
 	case PROP_WINDOW:
 		g_value_set_object (value, seahorse_view_get_window (SEAHORSE_VIEW (self)));
 		break;
@@ -810,11 +806,7 @@ seahorse_viewer_class_init (SeahorseViewerClass *klass)
 	g_object_class_install_property (gobject_class, PROP_WINDOW,
 	           g_param_spec_object ("window", "Window", "Window of View",
 	                                GTK_TYPE_WIDGET, G_PARAM_READABLE));
-	
-	g_object_class_install_property (gobject_class, PROP_CURRENT_SET,
-	           g_param_spec_object ("current-set", "Current Set", "Currently visible set of objects",
-	                                SEAHORSE_TYPE_SET, G_PARAM_READABLE));
-	
+
 	exportable_predicate.flags = SEAHORSE_FLAG_EXPORTABLE;
 	deletable_predicate.flags = SEAHORSE_FLAG_DELETABLE;
 	importable_predicate.flags = SEAHORSE_FLAG_EXPORTABLE;
@@ -830,7 +822,6 @@ seahorse_viewer_implement_view (SeahorseViewIface *iface)
 	iface->get_selected = (gpointer)seahorse_viewer_get_selected;
 	iface->set_selected = (gpointer)seahorse_viewer_set_selected;
 	iface->get_selected_matching = (gpointer)seahorse_viewer_get_selected_matching;
-	iface->get_current_set = (gpointer)seahorse_viewer_get_current_set;
 	iface->get_window = (gpointer)seahorse_viewer_get_window;
 	iface->register_ui = (gpointer)seahorse_viewer_register_ui;
 	iface->register_commands = (gpointer)seahorse_viewer_register_commands;
@@ -958,15 +949,6 @@ seahorse_viewer_set_selected (SeahorseViewer* self, SeahorseObject* value)
 	SEAHORSE_VIEWER_GET_CLASS (self)->set_selected (self, value);
 }
 
-SeahorseSet*
-seahorse_viewer_get_current_set (SeahorseViewer* self)
-{
-	g_return_val_if_fail (SEAHORSE_IS_VIEWER (self), NULL);
-	g_return_val_if_fail (SEAHORSE_VIEWER_GET_CLASS (self)->get_current_set, NULL);
-	
-	return SEAHORSE_VIEWER_GET_CLASS (self)->get_current_set (self);
-}
-
 GtkWindow* 
 seahorse_viewer_get_window (SeahorseViewer* self) 
 {
diff --git a/src/seahorse-viewer.h b/src/seahorse-viewer.h
index 82fdbad..35eb686 100644
--- a/src/seahorse-viewer.h
+++ b/src/seahorse-viewer.h
@@ -58,9 +58,7 @@ struct _SeahorseViewerClass {
 	SeahorseObject* (*get_selected) (SeahorseViewer* self);
 	
 	void (*set_selected) (SeahorseViewer* self, SeahorseObject* value);
-	
-	SeahorseSet* (*get_current_set) (SeahorseViewer* self);
-    
+
 	/* signals --------------------------------------------------------- */
     
 	void (*signal)   (SeahorseViewer *viewer);
@@ -100,8 +98,6 @@ SeahorseObject*     seahorse_viewer_get_selected                    (SeahorseVie
 void                seahorse_viewer_set_selected                    (SeahorseViewer* self, 
                                                                      SeahorseObject* value);
 
-SeahorseSet*        seahorse_viewer_get_current_set                 (SeahorseViewer* self);
-
 GtkWindow*          seahorse_viewer_get_window                      (SeahorseViewer* self);
 
 void                seahorse_viewer_register_ui                     (SeahorseViewer *self, 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]