[Gaim-commits] SF.net SVN: gaim: [17581] trunk/libgaim/network.c

[<nos...@us...>]

Revision: 17581
          http://svn.sourceforge.net/gaim/?rev=17581&view=rev
Author:   nosnilmot
Date:     2006-10-25 05:51:22 -0700 (Wed, 25 Oct 2006)

Log Message:
-----------
Check to make sure UI ops exist for network_connected and network_disconnected
before calling them. Thanks to plaes on #gaim who says this fixes some
gaim-text crashes.

Modified Paths:
--------------
    trunk/libgaim/network.c

Modified: trunk/libgaim/network.c
===================================================================
--- trunk/libgaim/network.c	2006-10-25 12:14:23 UTC (rev 17580)
+++ trunk/libgaim/network.c	2006-10-25 12:51:22 UTC (rev 17581)
@@ -436,9 +436,10 @@
 
 	gaim_debug_info("network", "Received Network Change Notification. Current network count is %d, previous count was %d.\n", new_count, current_network_count);
 
-	if (new_count > 0) {
+	if (new_count > 0 && ui_ops != NULL && ui_ops->network_connected != NULL) {
 		ui_ops->network_connected();
-	} else if (new_count == 0 && current_network_count > 0) {
+	} else if (new_count == 0 && current_network_count > 0 &&
+			   ui_ops != NULL && ui_ops->network_disconnected != NULL) {
 		ui_ops->network_disconnected();
 	}
 
@@ -548,13 +549,15 @@
 	case LIBNM_ACTIVE_NETWORK_CONNECTION:
 		/* Call res_init in case DNS servers have changed */
 		res_init();
-		ui_ops->network_connected();
+		if (ui_ops != NULL && ui_ops->network_connected != NULL)
+			ui_ops->network_connected();
 		prev = current;
 		break;
 	case LIBNM_NO_NETWORK_CONNECTION:
 		if (prev != LIBNM_ACTIVE_NETWORK_CONNECTION)
 			break;
-		ui_ops->network_disconnected();
+		if (ui_ops != NULL && ui_ops->network_disconnected != NULL)
+			ui_ops->network_disconnected();
 		prev = current;
 		break;
 	case LIBNM_NO_DBUS:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.