seahorse r2597 - in trunk: . src

[sadam svn gnome org]

Author: sadam
Date: Wed Oct 29 20:29:00 2008
New Revision: 2597
URL: http://svn.gnome.org/viewvc/seahorse?rev=2597&view=rev

Log:
2008-10-29  Adam Schreiber  <sadam clemson edu>

    * src/seahorse-keyserver-results.c:
    * src/seahorse-keyserver-results.vala:
    * src/seahorse-key-manager.c:
    * src/seahorse-key-manager.vala: Clean up errors in declaration of 
signal
    handlers.  Fixes bug #558406


Modified:
   trunk/ChangeLog
   trunk/src/seahorse-key-manager.c
   trunk/src/seahorse-key-manager.vala
   trunk/src/seahorse-keyserver-results.c
   trunk/src/seahorse-keyserver-results.vala

Modified: trunk/src/seahorse-key-manager.c
==============================================================================
--- trunk/src/seahorse-key-manager.c	(original)
+++ trunk/src/seahorse-key-manager.c	Wed Oct 29 20:29:00 2008
@@ -109,16 +109,16 @@
 static gboolean _seahorse_key_manager_fire_selection_changed_gsource_func (gpointer self);
 static void seahorse_key_manager_on_view_selection_changed (SeahorseKeyManager* self, GtkTreeSelection* selection);
 static void seahorse_key_manager_on_row_activated (SeahorseKeyManager* self, GtkTreeView* view, GtkTreePath* path, GtkTreeViewColumn* column);
-static gboolean seahorse_key_manager_on_key_list_button_pressed (SeahorseKeyManager* self, GtkWidget* widget, GdkEventButton* event);
+static gboolean seahorse_key_manager_on_key_list_button_pressed (SeahorseKeyManager* self, GtkTreeView* view, GdkEventButton* event);
 static gboolean seahorse_key_manager_on_key_list_popup_menu (SeahorseKeyManager* self, GtkTreeView* view);
 static void seahorse_key_manager_on_key_generate (SeahorseKeyManager* self, GtkAction* action);
-static void seahorse_key_manager_on_new_button_clicked (SeahorseKeyManager* self, GtkWidget* widget);
+static void seahorse_key_manager_on_new_button_clicked (SeahorseKeyManager* self, GtkButton* button);
 static void seahorse_key_manager_imported_keys (SeahorseKeyManager* self, SeahorseOperation* op);
 static void _seahorse_key_manager_imported_keys_seahorse_done_func (SeahorseOperation* op, gpointer self);
 static void seahorse_key_manager_import_files (SeahorseKeyManager* self, char** uris, int uris_length1);
 static void seahorse_key_manager_import_prompt (SeahorseKeyManager* self);
 static void seahorse_key_manager_on_key_import_file (SeahorseKeyManager* self, GtkAction* action);
-static void seahorse_key_manager_on_import_button_clicked (SeahorseKeyManager* self, GtkWidget* widget);
+static void seahorse_key_manager_on_import_button_clicked (SeahorseKeyManager* self, GtkButton* button);
 static void seahorse_key_manager_import_text (SeahorseKeyManager* self, const char* text);
 static void seahorse_key_manager_on_target_drag_data_received (SeahorseKeyManager* self, GtkWindow* window, GdkDragContext* context, gint x, gint y, GtkSelectionData* selection_data, guint info, guint time_);
 static void seahorse_key_manager_clipboard_received (SeahorseKeyManager* self, GtkClipboard* board, const char* text);
@@ -490,9 +490,9 @@
 }
 
 
-static gboolean seahorse_key_manager_on_key_list_button_pressed (SeahorseKeyManager* self, GtkWidget* widget, GdkEventButton* event) {
+static gboolean seahorse_key_manager_on_key_list_button_pressed (SeahorseKeyManager* self, GtkTreeView* view, GdkEventButton* event) {
 	g_return_val_if_fail (SEAHORSE_IS_KEY_MANAGER (self), FALSE);
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+	g_return_val_if_fail (GTK_IS_TREE_VIEW (view), FALSE);
 	if ((*event).button == 3) {
 		seahorse_viewer_show_context_menu (SEAHORSE_VIEWER (self), (*event).button, (*event).time);
 	}
@@ -524,9 +524,9 @@
 }
 
 
-static void seahorse_key_manager_on_new_button_clicked (SeahorseKeyManager* self, GtkWidget* widget) {
+static void seahorse_key_manager_on_new_button_clicked (SeahorseKeyManager* self, GtkButton* button) {
 	g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self));
-	g_return_if_fail (GTK_IS_WIDGET (widget));
+	g_return_if_fail (GTK_IS_BUTTON (button));
 	seahorse_generate_select_show (seahorse_viewer_get_window (SEAHORSE_VIEWER (self)));
 }
 
@@ -669,9 +669,9 @@
 }
 
 
-static void seahorse_key_manager_on_import_button_clicked (SeahorseKeyManager* self, GtkWidget* widget) {
+static void seahorse_key_manager_on_import_button_clicked (SeahorseKeyManager* self, GtkButton* button) {
 	g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self));
-	g_return_if_fail (GTK_IS_WIDGET (widget));
+	g_return_if_fail (GTK_IS_BUTTON (button));
 	seahorse_key_manager_import_prompt (self);
 }
 

Modified: trunk/src/seahorse-key-manager.vala
==============================================================================
--- trunk/src/seahorse-key-manager.vala	(original)
+++ trunk/src/seahorse-key-manager.vala	Wed Oct 29 20:29:00 2008
@@ -434,7 +434,7 @@
 				show_properties (obj);
 		}
 
-		private bool on_key_list_button_pressed (Gtk.Widget widget, Gdk.EventButton event) {
+		private bool on_key_list_button_pressed (Gtk.TreeView view, Gdk.EventButton event) {
 			if (event.button == 3)
 				show_context_menu (event.button, event.time);
 			return false;
@@ -453,7 +453,7 @@
 			GenerateSelect.show (window);
 		}
 		
-		private void on_new_button_clicked (Gtk.Widget widget) {
+		private void on_new_button_clicked (Gtk.Button button) {
 			GenerateSelect.show (window);
 		}
 		
@@ -525,7 +525,7 @@
 			import_prompt ();	
 		}
 		
-		private void on_import_button_clicked (Gtk.Widget widget) {
+		private void on_import_button_clicked (Gtk.Button button) {
 			import_prompt ();
 		}
 		

Modified: trunk/src/seahorse-keyserver-results.c
==============================================================================
--- trunk/src/seahorse-keyserver-results.c	(original)
+++ trunk/src/seahorse-keyserver-results.c	Wed Oct 29 20:29:00 2008
@@ -58,7 +58,7 @@
 static gboolean _seahorse_keyserver_results_fire_selection_changed_gsource_func (gpointer self);
 static void seahorse_keyserver_results_on_view_selection_changed (SeahorseKeyserverResults* self, GtkTreeSelection* selection);
 static void seahorse_keyserver_results_on_row_activated (SeahorseKeyserverResults* self, GtkTreeView* view, GtkTreePath* path, GtkTreeViewColumn* column);
-static gboolean seahorse_keyserver_results_on_key_list_button_pressed (SeahorseKeyserverResults* self, GtkWidget* widget, GdkEventButton* event);
+static gboolean seahorse_keyserver_results_on_key_list_button_pressed (SeahorseKeyserverResults* self, GtkTreeView* view, GdkEventButton* event);
 static gboolean seahorse_keyserver_results_on_key_list_popup_menu (SeahorseKeyserverResults* self, GtkTreeView* view);
 static void seahorse_keyserver_results_on_view_expand_all (SeahorseKeyserverResults* self, GtkAction* action);
 static void seahorse_keyserver_results_on_view_collapse_all (SeahorseKeyserverResults* self, GtkAction* action);
@@ -196,9 +196,9 @@
 }
 
 
-static gboolean seahorse_keyserver_results_on_key_list_button_pressed (SeahorseKeyserverResults* self, GtkWidget* widget, GdkEventButton* event) {
+static gboolean seahorse_keyserver_results_on_key_list_button_pressed (SeahorseKeyserverResults* self, GtkTreeView* view, GdkEventButton* event) {
 	g_return_val_if_fail (SEAHORSE_IS_KEYSERVER_RESULTS (self), FALSE);
-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+	g_return_val_if_fail (GTK_IS_TREE_VIEW (view), FALSE);
 	if ((*event).button == 3) {
 		seahorse_viewer_show_context_menu (SEAHORSE_VIEWER (self), (*event).button, (*event).time);
 	}

Modified: trunk/src/seahorse-keyserver-results.vala
==============================================================================
--- trunk/src/seahorse-keyserver-results.vala	(original)
+++ trunk/src/seahorse-keyserver-results.vala	Wed Oct 29 20:29:00 2008
@@ -179,7 +179,7 @@
 				show_properties (obj);
 		}
 
-		private bool on_key_list_button_pressed (Gtk.Widget widget, Gdk.EventButton event) {
+		private bool on_key_list_button_pressed (Gtk.TreeView view, Gdk.EventButton event) {
 			if (event.button == 3)
 				show_context_menu (event.button, event.time);
 			return false;