[PATCH] applet.c fixes



In nma_show_vpn_failure_dialog the function is declared void so this takes
care of a couple of warnings and fixes a few compile errors.

cb_data is not defined in this function to change it to the title that is
passed into the function.

Not sure what the g_object_set_data was accomplishing so just remove it.

Disclaimer: This may very well be totally bogus since my glib/gtk skills
are virtually non-existant, but this worked for me.

-Brian

RCS file: /cvs/gnome/NetworkManager/gnome/applet/applet.c,v
retrieving revision 1.108
diff -u -r1.108 applet.c
--- gnome/applet/applet.c	1 Mar 2006 03:24:09 -0000	1.108
+++ gnome/applet/applet.c	1 Mar 2006 03:46:28 -0000
@@ -377,15 +377,14 @@
 {
 	GtkWidget	*dialog;
 
-	g_return_val_if_fail (title != NULL, FALSE);
-	g_return_val_if_fail (msg != NULL, FALSE);
+	g_return_if_fail (title != NULL);
+	g_return_if_fail (msg != NULL);
 
 	dialog = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK, msg, NULL);
-	gtk_window_set_title (GTK_WINDOW (dialog), cb_data->title);
+	gtk_window_set_title (GTK_WINDOW (dialog), title);
 	g_signal_connect (dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
 	g_signal_connect (dialog, "close", G_CALLBACK (gtk_widget_destroy), NULL);
-	g_object_set_data (G_OBJECT (dialog), "data", cb_data);
 
 	/* Bash focus-stealing prevention in the face */
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);



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