2006-03-05 Dan Williams <dcbw@redhat.com>

* gnome/applet/applet-notifications.h
		- Protect prototype of nma_send_event_notification() because it
			includes libnotify-specific types
		- Include libnotify/libnotify.h too, since we technically need it

	* gnome/applet/applet.c
		- (nma_show_vpn_failure_dialog): fix usage of g_return_if_fail
		- (nma_show_vpn_login_banner_dialog): add some error checking


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1551 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2006-03-05 18:54:19 +00:00
parent e77a9ee808
commit 6eacb970f2
3 changed files with 21 additions and 2 deletions

View file

@ -1,3 +1,14 @@
2006-03-05 Dan Williams <dcbw@redhat.com>
* gnome/applet/applet-notifications.h
- Protect prototype of nma_send_event_notification() because it
includes libnotify-specific types
- Include libnotify/libnotify.h too, since we technically need it
* gnome/applet/applet.c
- (nma_show_vpn_failure_dialog): fix usage of g_return_if_fail
- (nma_show_vpn_login_banner_dialog): add some error checking
2006-03-04 Dan Williams <dcbw@redhat.com>
Clean up activation cancellation. Should be a lot faster now. Observed

View file

@ -22,6 +22,9 @@
#ifndef NM_NOTIFICATION_H__
#define NM_NOTIFICATION_H__
#ifdef ENABLE_NOTIFY
#include <libnotify/notify.h>
#include "applet.h"
void
@ -31,4 +34,6 @@ nma_send_event_notification (NMApplet *applet,
const char *message,
const char *icon);
#endif /* ENABLE_NOTIFY */
#endif /* NM_NOTIFICATION_H__ */

View file

@ -386,8 +386,8 @@ nma_show_vpn_failure_dialog (const char *title,
{
GtkWidget *dialog;
g_return_if_fail (title != NULL, FALSE);
g_return_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);
@ -480,6 +480,9 @@ nma_show_vpn_login_banner_dialog (const char *title,
{
GtkWidget *dialog;
g_return_if_fail (title != NULL);
g_return_if_fail (msg != NULL);
dialog = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_INFO,
GTK_BUTTONS_OK, msg, NULL);
gtk_window_set_title (GTK_WINDOW (dialog), title);