1 files changed, 140 insertions, 128 deletions

diff --git a/src/calendar.c b/src/calendar.c
index 9f82cc63..9aaf927f 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -23,146 +23,158 @@
 
 #include "config.h"
 
-#include <time.h>
-#include "zenity.h"
 #include "util.h"
-
+#include "zenity.h"
+#include <time.h>
 
 static GtkWidget *calendar;
 static ZenityCalendarData *zen_cal_data;
 
-static void zenity_calendar_dialog_response (GtkWidget *widget, int response, gpointer data);
+static void zenity_calendar_dialog_response (
+	GtkWidget *widget, int response, gpointer data);
 static void zenity_calendar_double_click (GtkCalendar *calendar, gpointer data);
 
-void 
-zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data)
-{
-  GtkBuilder *builder;
-  GtkWidget *dialog;
-  GtkWidget *button;
-  GObject *text;
-
-  zen_cal_data = cal_data;
-
-  builder = zenity_util_load_ui_file ("zenity_calendar_dialog", NULL);
-
-  if (builder == NULL) {
-    data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
-    return;
-  }
-	
-  gtk_builder_connect_signals (builder, NULL);
-
-  dialog = GTK_WIDGET (gtk_builder_get_object (builder,
-  					       "zenity_calendar_dialog"));
-
-  g_signal_connect (G_OBJECT (dialog), "response",
-                    G_CALLBACK (zenity_calendar_dialog_response), data);
-
-  if (data->dialog_title)	
-    gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
-
-  zenity_util_set_window_icon (dialog, data->window_icon, ZENITY_IMAGE_FULLPATH ("zenity-calendar.png"));
-
-  if (data->width > -1 || data->height > -1)
-    gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
-
-  if (data->modal)
-    gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-
-  text = gtk_builder_get_object (builder, "zenity_calendar_text");
-
-  if (cal_data->dialog_text)
-    gtk_label_set_markup (GTK_LABEL (text), g_strcompress (cal_data->dialog_text));
-
-  calendar = GTK_WIDGET (gtk_builder_get_object (builder, "zenity_calendar"));
-	
-  if (cal_data->month > 0 || cal_data->year > 0)
-    gtk_calendar_select_month (GTK_CALENDAR (calendar), cal_data->month - 1, cal_data->year);
-  if (cal_data->day > 0)
-    gtk_calendar_select_day (GTK_CALENDAR (calendar), cal_data->day);
-
-  g_signal_connect (calendar, "day-selected-double-click",
-		    G_CALLBACK (zenity_calendar_double_click), data);
-
-  gtk_label_set_mnemonic_widget (GTK_LABEL (text), calendar);
-  zenity_util_show_dialog (dialog, data->attach);
-
-  if (data->timeout_delay > 0) {
-    g_timeout_add_seconds (data->timeout_delay, (GSourceFunc) zenity_util_timeout_handle, dialog);
-  }
-  
-  if (data->extra_label) {
-    gint i=0;
-    while(data->extra_label[i]!=NULL){
-      gtk_dialog_add_button (GTK_DIALOG (dialog), data->extra_label[i], i);
-      i++;
-    }
-  }
-  
-  if (data->ok_label) {
-    button = GTK_WIDGET (gtk_builder_get_object (builder, "zenity_calendar_ok_button"));
-    gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
-  }
-
-  if (data->cancel_label) {
-    button = GTK_WIDGET (gtk_builder_get_object (builder, "zenity_calendar_cancel_button"));
-    gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
-  }
-
-  g_object_unref (builder);
-
-  gtk_main ();
+void
+zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data) {
+	GtkBuilder *builder;
+	GtkWidget *dialog;
+	GtkWidget *button;
+	GObject *text;
+
+	zen_cal_data = cal_data;
+
+	builder = zenity_util_load_ui_file ("zenity_calendar_dialog", NULL);
+
+	if (builder == NULL) {
+		data->exit_code = zenity_util_return_exit_code (ZENITY_ERROR);
+		return;
+	}
+
+	gtk_builder_connect_signals (builder, NULL);
+
+	dialog =
+		GTK_WIDGET (gtk_builder_get_object (builder, "zenity_calendar_dialog"));
+
+	g_signal_connect (G_OBJECT (dialog),
+		"response",
+		G_CALLBACK (zenity_calendar_dialog_response),
+		data);
+
+	if (data->dialog_title)
+		gtk_window_set_title (GTK_WINDOW (dialog), data->dialog_title);
+
+	zenity_util_set_window_icon (dialog,
+		data->window_icon,
+		ZENITY_IMAGE_FULLPATH ("zenity-calendar.png"));
+
+	if (data->width > -1 || data->height > -1)
+		gtk_window_set_default_size (
+			GTK_WINDOW (dialog), data->width, data->height);
+
+	if (data->modal)
+		gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+	text = gtk_builder_get_object (builder, "zenity_calendar_text");
+
+	if (cal_data->dialog_text)
+		gtk_label_set_markup (
+			GTK_LABEL (text), g_strcompress (cal_data->dialog_text));
+
+	calendar = GTK_WIDGET (gtk_builder_get_object (builder, "zenity_calendar"));
+
+	if (cal_data->month > 0 || cal_data->year > 0)
+		gtk_calendar_select_month (
+			GTK_CALENDAR (calendar), cal_data->month - 1, cal_data->year);
+	if (cal_data->day > 0)
+		gtk_calendar_select_day (GTK_CALENDAR (calendar), cal_data->day);
+
+	g_signal_connect (calendar,
+		"day-selected-double-click",
+		G_CALLBACK (zenity_calendar_double_click),
+		data);
+
+	gtk_label_set_mnemonic_widget (GTK_LABEL (text), calendar);
+	zenity_util_show_dialog (dialog, data->attach);
+
+	if (data->timeout_delay > 0) {
+		g_timeout_add_seconds (data->timeout_delay,
+			(GSourceFunc) zenity_util_timeout_handle,
+			dialog);
+	}
+
+	if (data->extra_label) {
+		gint i = 0;
+		while (data->extra_label[i] != NULL) {
+			gtk_dialog_add_button (
+				GTK_DIALOG (dialog), data->extra_label[i], i);
+			i++;
+		}
+	}
+
+	if (data->ok_label) {
+		button = GTK_WIDGET (
+			gtk_builder_get_object (builder, "zenity_calendar_ok_button"));
+		gtk_button_set_label (GTK_BUTTON (button), data->ok_label);
+	}
+
+	if (data->cancel_label) {
+		button = GTK_WIDGET (
+			gtk_builder_get_object (builder, "zenity_calendar_cancel_button"));
+		gtk_button_set_label (GTK_BUTTON (button), data->cancel_label);
+	}
+
+	g_object_unref (builder);
+
+	gtk_main ();
 }
-static void 
-zenity_calendar_dialog_output (void)
-{
-  guint day, month, year;
-  gchar time_string[128];
-  GDate *date = NULL;
-  
-  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_print ("%s\n", time_string);
-
-  if (date != NULL)
-    g_date_free (date);
+static void
+zenity_calendar_dialog_output (void) {
+	guint day, month, year;
+	gchar time_string[128];
+	GDate *date = NULL;
+
+	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_print ("%s\n", time_string);
+
+	if (date != NULL)
+		g_date_free (date);
 }
 
 static void
-zenity_calendar_dialog_response (GtkWidget *widget, int response, gpointer data)
-{
-  ZenityData *zen_data;
-
-  zen_data = data;
-
-  switch (response) {
-    case GTK_RESPONSE_OK:
-      zenity_calendar_dialog_output ();
-      zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);   
-      break;
-
-    case GTK_RESPONSE_CANCEL:
-      zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
-      break;
-
-    case ZENITY_TIMEOUT:
-      zenity_calendar_dialog_output ();
-      zen_data->exit_code = zenity_util_return_exit_code (ZENITY_TIMEOUT);
-      break;
-
-    default:
-      if (zen_data->extra_label && response < g_strv_length(zen_data->extra_label))
-        printf("%s\n",zen_data->extra_label[response]);
-      zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
-      break;
-  }
-  gtk_main_quit ();
+zenity_calendar_dialog_response (
+	GtkWidget *widget, int response, gpointer data) {
+	ZenityData *zen_data;
+
+	zen_data = data;
+
+	switch (response) {
+		case GTK_RESPONSE_OK:
+			zenity_calendar_dialog_output ();
+			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK);
+			break;
+
+		case GTK_RESPONSE_CANCEL:
+			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_CANCEL);
+			break;
+
+		case ZENITY_TIMEOUT:
+			zenity_calendar_dialog_output ();
+			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_TIMEOUT);
+			break;
+
+		default:
+			if (zen_data->extra_label &&
+				response < g_strv_length (zen_data->extra_label))
+				printf ("%s\n", zen_data->extra_label[response]);
+			zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
+			break;
+	}
+	gtk_main_quit ();
 }
 
 static void
-zenity_calendar_double_click (GtkCalendar *cal, gpointer data)
-{
-  zenity_calendar_dialog_response (NULL, GTK_RESPONSE_OK, data);
+zenity_calendar_double_click (GtkCalendar *cal, gpointer data) {
+	zenity_calendar_dialog_response (NULL, GTK_RESPONSE_OK, data);
 }