summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/calendar.c3
-rw-r--r--src/gdialog14
3 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e251407..c1c3751 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-27 Mike Newman <mike@gtnorthern.demon.co.uk>
+
+ * src/calendar.c: clean up some inconsistent indentation.
+ * src/gdialog: take notice of height and width args in textbox
+ because gdialog did.
+
2003-05-24 Mike Newman <mikegtn@gnome.org>
* src/progress.c: Make "OK" sensitive if progress bar has
diff --git a/src/calendar.c b/src/calendar.c
index 1316d51..460ab8d 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -99,8 +99,7 @@ zenity_calendar_dialog_response (GtkWidget *widget, int response, gpointer data)
case GTK_RESPONSE_OK:
gtk_calendar_get_date (GTK_CALENDAR (calendar), &day, &month, &year);
date = g_date_new_dmy (year, month + 1, day);
- g_date_strftime (time_string, 127,
- zen_cal_data->date_format, date);
+ g_date_strftime (time_string, 127, zen_cal_data->date_format, date);
g_printerr ("%s\n", time_string);
if (date != NULL)
diff --git a/src/gdialog b/src/gdialog
index 20322c7..02ac6a9 100644
--- a/src/gdialog
+++ b/src/gdialog
@@ -28,6 +28,8 @@ sub get_arg () {
# walk the command line
+print $args;
+
ARG: while ($argn < $args) {
get_arg;
@@ -115,6 +117,18 @@ ARG: while ($argn < $args) {
$argn++;
get_arg;
$command .= "--filename=\"$element\" ";
+
+ # width and height matter for this one, so get them
+ # and apply the same multipliers as used in gdialog
+
+ $argn++;
+ get_arg;
+ $element = $element * 8;
+ $command .= "--width=\"$element\" ";
+ $argn++;
+ get_arg;
+ $element = $element * 7;
+ $command .= "--height=\"$element\" ";
last ARG;
}