[Xfce4-commits] r23587 - xfcalendar/trunk/src

[Juha Kautto]

Author: juha
Date: 2006-11-01 20:50:19 +0000 (Wed, 01 Nov 2006)
New Revision: 23587

Modified:
   xfcalendar/trunk/src/appointment.c
   xfcalendar/trunk/src/appointment.h
Log:
added widget grab to get decent startup default place.
also some minor cleaning.


Modified: xfcalendar/trunk/src/appointment.c
===================================================================
--- xfcalendar/trunk/src/appointment.c	2006-11-01 20:17:11 UTC (rev 23586)
+++ xfcalendar/trunk/src/appointment.c	2006-11-01 20:50:19 UTC (rev 23587)
@@ -60,6 +60,9 @@
 extern char *local_icaltimezone_location;
 extern gboolean local_icaltimezone_utc;
 
+void
+fill_appt_window(appt_win *apptw, char *action, char *par);
+
 enum {
     LOCATION,
     LOCATION_ENG,
@@ -1322,8 +1325,8 @@
 
     /* Menu bar */
     apptw->appMenubar = gtk_menu_bar_new();
-    gtk_box_pack_start(GTK_BOX(apptw->appVBox1), apptw->appMenubar,
-                        FALSE, FALSE, 0);
+    gtk_box_pack_start(GTK_BOX(apptw->appVBox1), apptw->appMenubar
+            , FALSE, FALSE, 0);
 
     /* File menu stuff */
     apptw->appFile_menu = xfcalendar_menu_new(_("_File"), apptw->appMenubar);
@@ -1541,6 +1544,7 @@
             , apptw->appNote, apptw->appNote_Scrolledwindow, 7
             , (GtkAttachOptions) (GTK_EXPAND | GTK_FILL)
             , (GtkAttachOptions) (GTK_EXPAND | GTK_FILL));
+    gtk_widget_grab_focus(apptw->appTitle_entry);
 }
 
 void
@@ -1749,10 +1753,9 @@
 *create_appt_win(char *action, char *par, eventlist_win *event_list)
 {
     int i;
+    appt_win *apptw = g_new(appt_win, 1);
 
     /* main window creation and base elements */
-    appt_win *apptw = g_new(appt_win, 1);
-
     apptw->xf_uid = NULL;
     apptw->eventlist = event_list;    /* Keep track of the parent, if any */
     apptw->appointment_changed = FALSE;

Modified: xfcalendar/trunk/src/appointment.h
===================================================================
--- xfcalendar/trunk/src/appointment.h	2006-11-01 20:17:11 UTC (rev 23586)
+++ xfcalendar/trunk/src/appointment.h	2006-11-01 20:50:19 UTC (rev 23587)
@@ -1,7 +1,7 @@
 /* appointment.h
  *
- * Copyright (C) 2004 Mickaël Graf <korbinus at xfce.org>
- * Copyright (C) 2005 Juha Kautto <kautto.juha at kolumbus.fi>
+ * Copyright (c) 2004-2006 Mickaël Graf <korbinus at xfce.org>
+ * Copyright (c) 2005-2006 Juha Kautto <juha at xfce.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -19,10 +19,14 @@
  *
  */
 
+#ifndef __APPOINTMENT_H__
+#define __APPOINTMENT_H__
+
 #define XFICAL_APPT_TIME_FORMAT "%04d%02d%02dT%02d%02d%02d"
 #define XFICAL_APPT_DATE_FORMAT "%04d%02d%02d"
 
-typedef enum {
+typedef enum 
+{
     XFICAL_FREQ_NONE = 0
     ,XFICAL_FREQ_DAILY
     ,XFICAL_FREQ_WEEKLY
@@ -184,11 +188,7 @@
      * add == TRUE && new == FALSE */
 } appt_win;
 
-void
-fill_appt_window_times(appt_win *apptw, appt_data *appt);
-
-void 
-fill_appt_window(appt_win *apptw, char *action, char *par);
-
 appt_win 
 *create_appt_win(char *action, char *par, eventlist_win *el);
+
+#endif /* !__APPOINTMENT_H__ */