summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/main.c6
-rw-r--r--src/notification.c1
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index edef765d..448d8a70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-27 Lucas Rocha <lucasr@gnome.org>
+
+ * src/main.c: initialize GTK+ before parsing command line options to
+ better handle errors on display setting (Fixes bug #410055).
+
2007-05-15 Lucas Rocha <lucasr@gnome.org>
* configure.in: post-release version bump.
diff --git a/src/main.c b/src/main.c
index 7e83fd89..1c37de2c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,13 +44,13 @@ main (gint argc, gchar **argv) {
#endif
bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
textdomain(GETTEXT_PACKAGE);
- results = zenity_option_parse (argc, argv);
-
- bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
gtk_init (&argc, &argv);
+ results = zenity_option_parse (argc, argv);
+
switch (results->mode) {
case MODE_CALENDAR:
zenity_calendar (results->data, results->calendar_data);
diff --git a/src/notification.c b/src/notification.c
index 35747be4..b5cdd406 100644
--- a/src/notification.c
+++ b/src/notification.c
@@ -48,6 +48,7 @@ zenity_notification_icon_update (void)
GError *error = NULL;
pixbuf = gdk_pixbuf_new_from_file_at_scale (icon_file, icon_size, icon_size, TRUE, &error);
+
if (error) {
g_warning ("Could not load notification icon '%s': %s",
icon_file, error->message);
bgstack15