summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLucas Rocha <lucasr@gnome.org>2007-05-27 20:09:27 +0000
committerLucas Almeida Rocha <lucasr@src.gnome.org>2007-05-27 20:09:27 +0000
commitb73e72bcfea040aaf4ea681068676de3ee013ac8 (patch)
treef12aebf251c0459d7053b248c929704132745fd5 /src
parentUpdated en_GB translation (diff)
downloadzenity-b73e72bcfea040aaf4ea681068676de3ee013ac8.tar.gz
zenity-b73e72bcfea040aaf4ea681068676de3ee013ac8.tar.bz2
zenity-b73e72bcfea040aaf4ea681068676de3ee013ac8.zip
initialize GTK+ before parsing command line options to better handle
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). svn path=/trunk/; revision=1217
Diffstat (limited to 'src')
-rw-r--r--src/main.c6
-rw-r--r--src/notification.c1
2 files changed, 4 insertions, 3 deletions
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