gnome-nettool r869 - in trunk: . src

[aklapper svn gnome org]

Author: aklapper
Date: Wed Feb 25 17:33:59 2009
New Revision: 869
URL: http://svn.gnome.org/viewvc/gnome-nettool?rev=869&view=rev

Log:
2009-02-25  Andre Klapper  <a9016009 gmx de>

	* src/lookup.c:
	* src/main.c:
	* src/netstat.c:
	* src/nettool.c:
	Remove deprecated gtk/gdk functions. Fixes bug #573147.



Modified:
   trunk/ChangeLog
   trunk/src/lookup.c
   trunk/src/main.c
   trunk/src/netstat.c
   trunk/src/nettool.c

Modified: trunk/src/lookup.c
==============================================================================
--- trunk/src/lookup.c	(original)
+++ trunk/src/lookup.c	Wed Feb 25 17:33:59 2009
@@ -89,10 +89,6 @@
 		gtk_list_store_clear (GTK_LIST_STORE (model));
 	}
 
-	/*option_menu = netinfo->type;
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (option_menu));
-	active_item = gtk_menu_get_active (GTK_MENU (menu));
-	active_index = g_list_index (GTK_MENU_SHELL (menu)->children, active_item);*/
 	active_index = gtk_combo_box_get_active (GTK_COMBO_BOX (netinfo->type));
 
 	parent = gtk_widget_get_toplevel (netinfo->output);

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Wed Feb 25 17:33:59 2009
@@ -158,7 +158,7 @@
 	if (ping_input) {
 		current_page = PING;
 		netinfo_set_host (pinger, ping_input);
-		gtk_idle_add (start_initial_process_cb, pinger);
+		g_idle_add (start_initial_process_cb, pinger);
 	}
 	if (netstat_input) {
 		current_page = NETSTAT;
@@ -171,22 +171,22 @@
 		else if (! strcmp (netstat_input, "multicast"))
 			gtk_toggle_button_set_active
 				(GTK_TOGGLE_BUTTON (netstat->multicast), TRUE);
-		gtk_idle_add (start_initial_process_cb, netstat);
+		g_idle_add (start_initial_process_cb, netstat);
 	}
 	if (traceroute_input) {
 		current_page = TRACEROUTE;
 		netinfo_set_host (tracer, traceroute_input);
-		gtk_idle_add (start_initial_process_cb, tracer);
+		g_idle_add (start_initial_process_cb, tracer);
 	}
 	if (scan_input) {
 		current_page = PORTSCAN;
 		netinfo_set_host (scan, scan_input);
-		gtk_idle_add (start_initial_process_cb, scan);
+		g_idle_add (start_initial_process_cb, scan);
 	}
 	if (lookup_input) {
 		current_page = LOOKUP;
 		netinfo_set_host (lookup, lookup_input);
-		gtk_idle_add (start_initial_process_cb, lookup);
+		g_idle_add (start_initial_process_cb, lookup);
 	}
 	if (finger_input) {
 		gchar **split_input = NULL;
@@ -197,12 +197,12 @@
 		if (split_input[1])
 			netinfo_set_host (finger, split_input[1]);
 		g_strfreev (split_input);
-		gtk_idle_add (start_initial_process_cb, finger);
+		g_idle_add (start_initial_process_cb, finger);
 	}
 	if (whois_input) {
 		current_page = WHOIS;
 		netinfo_set_host (whois, whois_input);
-		gtk_idle_add (start_initial_process_cb, whois);
+		g_idle_add (start_initial_process_cb, whois);
 	}
 
 	notebook = glade_xml_get_widget (xml, "notebook");

Modified: trunk/src/netstat.c
==============================================================================
--- trunk/src/netstat.c	(original)
+++ trunk/src/netstat.c	Wed Feb 25 17:33:59 2009
@@ -60,7 +60,7 @@
 	g_print ("name: %s\n", gtk_widget_get_name (parent));
 	child = gtk_bin_get_child (GTK_BIN (parent));
 	
-	gtk_widget_ref (child);
+	g_object_ref (child);
 	
 	gtk_container_remove (GTK_CONTAINER (parent), child);
 	*/
@@ -80,7 +80,7 @@
 		gtk_tree_view_set_model (widget, multicast_model); */
 	}
 	
-	/* gtk_widget_unref (child); */
+	/* g_object_unref (child); */
 }
 
 static NetstatOption

Modified: trunk/src/nettool.c
==============================================================================
--- trunk/src/nettool.c	(original)
+++ trunk/src/nettool.c	Wed Feb 25 17:33:59 2009
@@ -468,7 +468,7 @@
 		if (!GTK_WIDGET_REALIZED (netinfo->output))
 			gtk_widget_realize (GTK_WIDGET (netinfo->output));
 		gdk_window_set_cursor ((netinfo->output)->window, cursor);
-		gdk_cursor_destroy (cursor);
+		gdk_cursor_unref (cursor);
 
 		if (netinfo->stbar_text) {
 			gtk_statusbar_pop (GTK_STATUSBAR (netinfo->status_bar), 0);