diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/calendar.c | 19 | ||||
| -rw-r--r-- | src/main.c | 31 | ||||
| -rw-r--r-- | src/msg.c | 6 |
3 files changed, 40 insertions, 16 deletions
diff --git a/src/calendar.c b/src/calendar.c index 29768caa..65c2bf90 100644 --- a/src/calendar.c +++ b/src/calendar.c @@ -28,6 +28,7 @@ static GtkWidget *calendar; +static ZenityCalendarData *zen_cal_data; static void zenity_calendar_dialog_response (GtkWidget *widget, int response, gpointer data); @@ -38,6 +39,8 @@ zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data) GtkWidget *dialog; GtkWidget *text; + zen_cal_data = cal_data; + glade_dialog = zenity_util_load_glade_file ("zenity_calendar_dialog"); if (glade_dialog == NULL) { @@ -50,7 +53,7 @@ zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data) dialog = glade_xml_get_widget (glade_dialog, "zenity_calendar_dialog"); g_signal_connect (G_OBJECT (dialog), "response", - G_CALLBACK (zenity_calendar_dialog_response), cal_data); + G_CALLBACK (zenity_calendar_dialog_response), data); if (data->dialog_title) gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title); @@ -81,20 +84,22 @@ zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data) static void zenity_calendar_dialog_response (GtkWidget *widget, int response, gpointer data) { - ZenityCalendarData *cal_data = data; ZenityData *zen_data; gint day, month, year; gchar time_string[128]; GDate *date = NULL; - + + zen_data = data; + switch (response) { case GTK_RESPONSE_OK: gtk_calendar_get_date (GTK_CALENDAR (calendar), &day, &month, &year); - date = g_date_new_dmy (year, month+1, day); + date = g_date_new_dmy (year, month + 1, day); g_date_strftime (time_string, 127, - cal_data->date_format, date); - g_printerr ("%s\n",time_string); - g_date_free ( date ); + zen_cal_data->date_format, date); + g_printerr ("%s\n", time_string); + if (date != NULL) + g_date_free (date); zen_data->exit_code = 0; gtk_main_quit (); break; @@ -855,8 +855,9 @@ void zenity_parse_options_callback (poptContext ctx, const char *arg, void *data) { - static gboolean parse_option_text = FALSE; - static gboolean parse_option_file = FALSE; + static gboolean parse_option_dateformat = FALSE; + static gint parse_option_text = 0; + static gint parse_option_file = 0; if (reason == POPT_CALLBACK_REASON_POST) { return; @@ -972,7 +973,13 @@ void zenity_parse_options_callback (poptContext ctx, case OPTION_QUESTIONTEXT: case OPTION_PROGRESSTEXT: case OPTION_WARNINGTEXT: - if (parse_option_text == TRUE) { + + /* FIXME: This is an ugly hack because of the way the poptOptions are + * ordered above. When you try and use an --option more than once + * parse_options_callback gets called for each option. Suckage + */ + + if (parse_option_text > 6) { g_printerr (_("--text given twice for the same dialog\n")); zenity_free_parsing_options (); exit (-1); @@ -999,7 +1006,7 @@ void zenity_parse_options_callback (poptContext ctx, zenity_free_parsing_options (); exit (-1); } - parse_option_text = TRUE; + parse_option_text++; break; case OPTION_DAY: if (results->mode != MODE_CALENDAR) { @@ -1046,7 +1053,13 @@ void zenity_parse_options_callback (poptContext ctx, zenity_free_parsing_options (); exit (-1); } + if (parse_option_dateformat == TRUE) { + g_printerr (_("--date-format given twice for the same dialog\n")); + zenity_free_parsing_options (); + exit (-1); + } results->calendar_data->date_format = g_strdup (arg); + parse_option_dateformat = TRUE; break; case OPTION_INPUTTEXT: if (results->mode != MODE_ENTRY) { @@ -1076,7 +1089,13 @@ void zenity_parse_options_callback (poptContext ctx, break; case OPTION_FILENAME: case OPTION_TEXTFILE: - if (parse_option_file == TRUE) { + + /* FIXME: This is an ugly hack because of the way the poptOptions are + * ordered above. When you try and use an --option more than once + * parse_options_callback gets called for each option. Suckage + */ + + if (parse_option_file > 2) { g_printerr (_("--filename given twice for the same dialog\n")); zenity_free_parsing_options (); exit (-1); @@ -1094,7 +1113,7 @@ void zenity_parse_options_callback (poptContext ctx, zenity_free_parsing_options (); exit (-1); } - parse_option_file = TRUE; + parse_option_file++; break; case OPTION_COLUMN: if (results->mode != MODE_LIST) { @@ -65,9 +65,6 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) break; } - if (glade_dialog) - g_object_unref (glade_dialog); - g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (zenity_msg_dialog_response), data); @@ -77,6 +74,9 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data) } glade_xml_signal_autoconnect (glade_dialog); + + if (glade_dialog) + g_object_unref (glade_dialog); if (data->dialog_title) gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title); |