summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlynn Foster <glynn.foster@sun.com>2005-01-31 22:17:38 +0000
committerGlynn Foster <gman@src.gnome.org>2005-01-31 22:17:38 +0000
commita4777781d1b7c0294048e78dbc758de238b386c2 (patch)
tree160a650323c9f45728d146384779706fa17e9254
parentdone (diff)
downloadzenity-a4777781d1b7c0294048e78dbc758de238b386c2.tar.gz
zenity-a4777781d1b7c0294048e78dbc758de238b386c2.tar.bz2
zenity-a4777781d1b7c0294048e78dbc758de238b386c2.zip
Patch from Chris Lahey for #165456. Updated.
2005-02-01 Glynn Foster <glynn.foster@sun.com> * src/notification.c, src/option.c: Patch from Chris Lahey for #165456. * src/about.c, THANKS: Updated.
-rw-r--r--ChangeLog6
-rw-r--r--THANKS3
-rw-r--r--src/about.c3
-rw-r--r--src/notification.c3
-rw-r--r--src/option.c3
5 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 51d67de8..4fd3d59c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-01 Glynn Foster <glynn.foster@sun.com>
+
+ * src/notification.c, src/option.c: Patch from Chris
+ Lahey for #165456.
+ * src/about.c, THANKS: Updated.
+
2005-01-17 Glynn Foster <glynn.foster@sun.com>
* configure.in: Post release bump.
diff --git a/THANKS b/THANKS
index 584075e0..5310ea4d 100644
--- a/THANKS
+++ b/THANKS
@@ -18,7 +18,8 @@
"John Fleck <jfleck inkstain net>",
"Sebastian Heinlein <glatzor pimpzkru de>",
"James Henstridge <james daa com au>",
- "Mihai T Lazarescu <mihai email it>",
+ "Chris Lahey <clahey ximian com>",
+ "Mihai T Lazarescu <mihai email it>",
"Sebastian Kapfer <sebastian_kapfer web de>",
"Tomasz Koczko <kloczek pld org pl>",
"Jordi Mallach <jordi sindominio net>",
diff --git a/src/about.c b/src/about.c
index d64d6777..afcdec13 100644
--- a/src/about.c
+++ b/src/about.c
@@ -66,7 +66,8 @@ static const gchar *author_credits[] = {
"John Fleck <jfleck inkstain net>",
"Sebastian Heinlein <glatzor pimpzkru de>",
"James Henstridge <james daa com au>",
- "Mihai T Lazarescu <mihai email it>",
+ "Chris Lahey <clahey ximian com>",
+ "Mihai T Lazarescu <mihai email it>",
"Sebastian Kapfer <sebastian_kapfer web de>",
"Tomasz Koczko <kloczek pld org pl>",
"Jordi Mallach <jordi sindominio net>",
diff --git a/src/notification.c b/src/notification.c
index 63b15116..0a723854 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -75,6 +75,7 @@ zenity_notification_icon_press_callback (GtkWidget *widget, GdkEventButton *even
zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
gtk_main_quit ();
+ return TRUE;
}
static gboolean
@@ -102,7 +103,7 @@ zenity_notification_icon_expose_callback (GtkWidget *widget, GdkEventExpose *eve
return FALSE;
}
-static gboolean
+static void
zenity_notification_icon_destroy_callback (GtkWidget *widget, gpointer data)
{
ZenityData *zen_data;
diff --git a/src/option.c b/src/option.c
index 65b5373c..cfc95e95 100644
--- a/src/option.c
+++ b/src/option.c
@@ -676,7 +676,8 @@ zenity_option_get_name (GOptionEntry *entries, gpointer arg_data)
for (i = 1; entries[i].long_name != NULL; i++) {
if (entries[i].arg_data == arg_data)
return (gchar *) entries[i].long_name;
- }
+ }
+ return NULL;
}
/* Error callback */
bgstack15