=== modified file 'src/gpm-notify.c'
--- src/gpm-notify.c 2008-11-06 07:20:46 +0000
+++ src/gpm-notify.c 2009-02-14 05:49:25 +0000
@@ -53,6 +53,14 @@
#define GPM_NOTIFY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GPM_TYPE_NOTIFY, GpmNotifyPrivate))
#define QUIRK_WEBSITE "http://people.freedesktop.org/~hughsient/quirk/"
+typedef struct
+{
+ NotifyActionCallback cb;
+ GFreeFunc free_func;
+ gpointer user_data;
+ gchar *label;
+} NotifyAlert;
+
struct GpmNotifyPrivate
{
GpmAcAdapter *ac_adapter;
@@ -63,6 +71,8 @@
#ifdef HAVE_LIBNOTIFY
NotifyNotification *libnotify;
#endif
+ GtkWidget *dialog;
+ GHashTable *alerts;
};
enum {
@@ -75,6 +85,96 @@
G_DEFINE_TYPE (GpmNotify, gpm_notify, G_TYPE_OBJECT)
+static void
+destroy_alert (NotifyAlert *alert)
+{
+ if (alert->user_data != NULL && alert->free_func != NULL)
+ alert->free_func (alert->user_data);
+
+ g_free (alert->label);
+
+ g_free (alert);
+}
+
+static void
+add_alert_action (GpmNotify *notify,
+ const char *action,
+ const char *label,
+ NotifyActionCallback callback,
+ gpointer user_data,
+ GFreeFunc free_func)
+{
+ NotifyAlert *alert = g_new0 (NotifyAlert, 1);
+ alert->cb = callback;
+ alert->user_data = user_data;
+ alert->free_func = free_func;
+ alert->label = g_strdup (label);
+
+ if (notify->priv->alerts == NULL) {
+ notify->priv->alerts = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ (GFreeFunc)destroy_alert);
+ }
+
+ g_hash_table_insert (notify->priv->alerts,
+ g_strdup (action),
+ alert);
+}
+
+static void
+alert_action_button_clicked (GtkWidget *widget, gpointer data)
+{
+ GpmNotify *notify = (GpmNotify*)g_object_get_data (G_OBJECT (widget), "notify");
+ gchar *action = (gchar*)data;
+ NotifyAlert* alert;
+
+ if (notify->priv->alerts != NULL) {
+ alert = (NotifyAlert*)g_hash_table_lookup (notify->priv->alerts,
+ action);
+ if (alert != NULL && alert->cb != NULL) {
+ alert->cb (notify->priv->libnotify,
+ action,
+ alert->user_data);
+ }
+ }
+
+ // XXX - free and remove from hash?
+}
+
+static gboolean
+gpm_notify_display_alert (GpmNotify *notify,
+ const gchar *title,
+ const gchar *content,
+ GpmNotifyTimeout timeout,
+ const gchar *msgicon,
+ GpmNotifyUrgency urgency)
+{
+ GtkMessageType msg_type;
+
+ if (urgency == GPM_NOTIFY_URGENCY_CRITICAL) {
+ msg_type = GTK_MESSAGE_WARNING;
+ } else {
+ msg_type = GTK_MESSAGE_INFO;
+ }
+
+ notify->priv->dialog = gtk_message_dialog_new_with_markup (NULL,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ msg_type,
+ GTK_BUTTONS_CLOSE,
+ "%s",
+ GPM_NAME);
+
+ gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (notify->priv->dialog), "%s", content);
+
+ g_signal_connect_swapped (notify->priv->dialog,
+ "response",
+ G_CALLBACK (gtk_widget_destroy),
+ notify->priv->dialog);
+
+ return TRUE;
+}
+
#ifdef HAVE_LIBNOTIFY
/**
* notify_closed_cb:
@@ -91,13 +191,21 @@
}
static gboolean
-gpm_notify_create (GpmNotify *notify,
- const gchar *title,
- const gchar *content,
- GpmNotifyTimeout timeout,
- const gchar *msgicon,
- GpmNotifyUrgency urgency)
+gpm_notify_create (GpmNotify *notify,
+ const gchar *title,
+ const gchar *content,
+ GpmNotifyTimeout timeout,
+ const gchar *msgicon,
+ GpmNotifyUrgency urgency,
+ gboolean alert)
{
+ if (alert) {
+ gpm_notify_display_alert (notify, title,
+ content, timeout,
+ msgicon, urgency);
+ return TRUE;
+ }
+
if (notify->priv->libnotify != NULL) {
// notify_notification_close (notify->priv->libnotify, NULL);
// notify->priv->libnotify = NULL;
@@ -130,15 +238,50 @@
return TRUE;
}
+static void
+add_action_buttons (gpointer key,
+ gpointer value,
+ gpointer user_data)
+{
+ GpmNotify *notify;
+ gchar *action;
+ NotifyAlert *alert;
+ GtkWidget *hbox;
+ GtkWidget *button;
+
+ action = (gchar*)key;
+ alert = (NotifyAlert*)value;
+ notify = (GpmNotify*)user_data;
+
+ button = gtk_button_new_with_label (alert->label);
+ g_signal_connect (G_OBJECT (button), "clicked",
+ G_CALLBACK (alert_action_button_clicked), action);
+ g_object_set_data (G_OBJECT (button), "notify", notify);
+
+ hbox = gtk_hbox_new (FALSE, 12);
+ gtk_box_pack_end (GTK_BOX (hbox), button, TRUE, FALSE, 0);
+
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (notify->priv->dialog)->vbox),
+ hbox, FALSE, FALSE, 0);
+ gtk_widget_show_all (hbox);
+}
+
static gboolean
gpm_notify_show (GpmNotify *notify)
{
gboolean ret;
- ret = notify_notification_show (notify->priv->libnotify, NULL);
- if (!ret) {
- egg_warning ("failed to send notification");
+
+ if (notify->priv->dialog != NULL) {
+ g_hash_table_foreach (notify->priv->alerts, add_action_buttons, notify);
+ gtk_window_present (GTK_WINDOW (notify->priv->dialog));
+ return TRUE;
+ } else {
+ ret = notify_notification_show (notify->priv->libnotify, NULL);
+ if (!ret) {
+ egg_warning ("failed to send notification");
+ }
+ return ret;
}
- return ret;
}
/**
@@ -161,13 +304,46 @@
const gchar *msgicon,
GpmNotifyUrgency urgency)
{
- gpm_notify_create (notify, title, content, timeout, msgicon, urgency);
+ gpm_notify_create (notify, title, content, timeout, msgicon, urgency, FALSE);
gpm_notify_show (notify);
return TRUE;
}
+static void
+gpm_notify_add_action (GpmNotify *notify,
+ const char *action,
+ const char *label,
+ NotifyActionCallback callback,
+ gpointer user_data,
+ GFreeFunc free_func)
+{
+ add_alert_action (notify,
+ action,
+ label,
+ callback,
+ user_data,
+ free_func);
+}
+
+
#else
+static void
+gpm_notify_add_action (GpmNotify *notify,
+ const char *action,
+ const char *label,
+ NotifyActionCallback callback,
+ gpointer user_data,
+ GFreeFunc free_func)
+{
+ add_alert_action (notify,
+ action,
+ label,
+ callback,
+ user_data,
+ free_func);
+}
+
/**
* gpm_notify_show:
*
@@ -176,6 +352,9 @@
static gboolean
gpm_notify_show (GpmNotify *notify)
{
+ g_hash_table_foreach (notify->priv->alerts, add_action_buttons, notify);
+ gtk_window_present (GTK_WINDOW (notify->priv->dialog));
+
return TRUE;
}
@@ -190,7 +369,8 @@
const gchar *content,
GpmNotifyTimeout timeout,
const gchar *msgicon,
- GpmNotifyUrgency urgency)
+ GpmNotifyUrgency urgency,
+ gboolean alert)
{
gpm_notify_display (notify, title, content, timeout, msgicon, urgency);
return TRUE;
@@ -216,32 +396,12 @@
const gchar *msgicon,
GpmNotifyUrgency urgency)
{
- GtkWidget *dialog;
- GtkMessageType msg_type;
-
- if (urgency == GPM_NOTIFY_URGENCY_CRITICAL) {
- msg_type = GTK_MESSAGE_WARNING;
- } else {
- msg_type = GTK_MESSAGE_INFO;
- }
-
- dialog = gtk_message_dialog_new_with_markup (NULL,
- GTK_DIALOG_DESTROY_WITH_PARENT,
- msg_type,
- GTK_BUTTONS_CLOSE,
- "%s",
- GPM_NAME);
-
- gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog), "%s", content);
-
- g_signal_connect_swapped (dialog,
- "response",
- G_CALLBACK (gtk_widget_destroy),
- dialog);
-
- gtk_window_present (GTK_WINDOW (dialog));
-
- return TRUE;
+ return gpm_notify_display_alert (notify,
+ title,
+ content,
+ timeout,
+ msgicon,
+ urgency);
}
#endif
@@ -376,22 +536,23 @@
gpm_notify_create (notify, title, msg, 0,
GTK_STOCK_DIALOG_WARNING,
- GPM_NOTIFY_URGENCY_CRITICAL);
+ GPM_NOTIFY_URGENCY_CRITICAL,
+ TRUE);
/* add extra stuff */
#ifdef HAVE_LIBNOTIFY
notify->priv->internet_url = g_strdup (website);
- notify_notification_add_action (notify->priv->libnotify,
- "visit-website",
- _("Visit recall website"),
- (NotifyActionCallback) notify_general_clicked_cb,
- notify, NULL);
+ gpm_notify_add_action (notify,
+ "visit-website",
+ _("Visit recall website"),
+ (NotifyActionCallback) notify_general_clicked_cb,
+ notify, NULL);
notify->priv->do_not_show_gconf = GPM_CONF_NOTIFY_PERHAPS_RECALL;
- notify_notification_add_action (notify->priv->libnotify,
- "dont-show-again",
- _("Do not show me this again"),
- (NotifyActionCallback) notify_general_clicked_cb,
- notify, NULL);
+ gpm_notify_add_action (notify,
+ "dont-show-again",
+ _("Do not show me this again"),
+ (NotifyActionCallback) notify_general_clicked_cb,
+ notify, NULL);
#endif
gpm_notify_show (notify);
@@ -422,16 +583,17 @@
gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_LONG,
GTK_STOCK_DIALOG_WARNING,
- GPM_NOTIFY_URGENCY_CRITICAL);
+ GPM_NOTIFY_URGENCY_CRITICAL,
+ TRUE);
/* add extra stuff */
#ifdef HAVE_LIBNOTIFY
notify->priv->do_not_show_gconf = GPM_CONF_NOTIFY_LOW_CAPACITY;
- notify_notification_add_action (notify->priv->libnotify,
- "dont-show-again",
- _("Do not show me this again"),
- (NotifyActionCallback) notify_general_clicked_cb,
- notify, NULL);
+ gpm_notify_add_action (notify,
+ "dont-show-again",
+ _("Do not show me this again"),
+ (NotifyActionCallback) notify_general_clicked_cb,
+ notify, NULL);
#endif
gpm_notify_show (notify);
@@ -462,16 +624,17 @@
gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_LONG,
GPM_STOCK_INHIBIT,
- GPM_NOTIFY_URGENCY_CRITICAL);
+ GPM_NOTIFY_URGENCY_CRITICAL,
+ FALSE);
/* add extra stuff */
#ifdef HAVE_LIBNOTIFY
notify->priv->do_not_show_gconf = GPM_CONF_NOTIFY_INHIBIT_LID;
- notify_notification_add_action (notify->priv->libnotify,
- "dont-show-again",
- _("Do not show me this again"),
- (NotifyActionCallback) notify_general_clicked_cb,
- notify, NULL);
+ gpm_notify_add_action (notify,
+ "dont-show-again",
+ _("Do not show me this again"),
+ (NotifyActionCallback) notify_general_clicked_cb,
+ notify, NULL);
#endif
gpm_notify_show (notify);
@@ -493,16 +656,17 @@
gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_SHORT,
GTK_STOCK_DIALOG_WARNING,
- GPM_NOTIFY_URGENCY_CRITICAL);
+ GPM_NOTIFY_URGENCY_CRITICAL,
+ FALSE);
/* add extra stuff */
#ifdef HAVE_LIBNOTIFY
notify->priv->do_not_show_gconf = GPM_CONF_NOTIFY_FULLY_CHARGED;
- notify_notification_add_action (notify->priv->libnotify,
- "dont-show-again",
- _("Do not show me this again"),
- (NotifyActionCallback) notify_general_clicked_cb,
- notify, NULL);
+ gpm_notify_add_action (notify,
+ "dont-show-again",
+ _("Do not show me this again"),
+ (NotifyActionCallback) notify_general_clicked_cb,
+ notify, NULL);
#endif
gpm_notify_show (notify);
@@ -523,16 +687,17 @@
gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_SHORT,
GTK_STOCK_DIALOG_WARNING,
- GPM_NOTIFY_URGENCY_CRITICAL);
+ GPM_NOTIFY_URGENCY_CRITICAL,
+ FALSE);
/* add extra stuff */
#ifdef HAVE_LIBNOTIFY
notify->priv->do_not_show_gconf = GPM_CONF_NOTIFY_DISCHARGING;
- notify_notification_add_action (notify->priv->libnotify,
- "dont-show-again",
- _("Do not show me this again"),
- (NotifyActionCallback) notify_general_clicked_cb,
- notify, NULL);
+ gpm_notify_add_action (notify,
+ "dont-show-again",
+ _("Do not show me this again"),
+ (NotifyActionCallback) notify_general_clicked_cb,
+ notify, NULL);
#endif
gpm_notify_show (notify);
@@ -553,16 +718,17 @@
gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_SHORT,
GTK_STOCK_DIALOG_WARNING,
- GPM_NOTIFY_URGENCY_CRITICAL);
+ GPM_NOTIFY_URGENCY_CRITICAL,
+ FALSE);
/* add extra stuff */
#ifdef HAVE_LIBNOTIFY
notify->priv->do_not_show_gconf = GPM_CONF_NOTIFY_DISCHARGING;
- notify_notification_add_action (notify->priv->libnotify,
- "dont-show-again",
- _("Do not show me this again"),
- (NotifyActionCallback) notify_general_clicked_cb,
- notify, NULL);
+ gpm_notify_add_action (notify,
+ "dont-show-again",
+ _("Do not show me this again"),
+ (NotifyActionCallback) notify_general_clicked_cb,
+ notify, NULL);
#endif
gpm_notify_show (notify);
@@ -589,16 +755,17 @@
}
gpm_notify_create (notify, title, msg, GPM_NOTIFY_TIMEOUT_NEVER, icon,
- GPM_NOTIFY_URGENCY_CRITICAL);
+ GPM_NOTIFY_URGENCY_CRITICAL,
+ TRUE);
/* add extra stuff */
#ifdef HAVE_LIBNOTIFY
notify->priv->do_not_show_gconf = GPM_CONF_NOTIFY_SLEEP_FAILED;
- notify_notification_add_action (notify->priv->libnotify,
- "dont-show-again",
- _("Do not show me this again"),
- (NotifyActionCallback) notify_general_clicked_cb,
- notify, NULL);
+ gpm_notify_add_action (notify,
+ "dont-show-again",
+ _("Do not show me this again"),
+ (NotifyActionCallback) notify_general_clicked_cb,
+ notify, NULL);
notify->priv->internet_url = g_strdup (QUIRK_WEBSITE);
/* Translator: Quirks refer to strange/weird/undocumented behaviour of
@@ -607,11 +774,11 @@
* supply the info by following the procedures outlined in the "Quirks
* website" at http://people.freedesktop.org/~hughsient/quirk/.
*/
- notify_notification_add_action (notify->priv->libnotify,
- "visit-website",
- _("Visit quirk website"),
- (NotifyActionCallback) notify_general_clicked_cb,
- notify, NULL);
+ gpm_notify_add_action (notify,
+ "visit-website",
+ _("Visit quirk website"),
+ (NotifyActionCallback) notify_general_clicked_cb,
+ notify, NULL);
#endif
gpm_notify_show (notify);