diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-15 01:38:47 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-15 01:49:08 +0800 |
| commit | 95fe9256305bad92697bf1043efcbd61238cf94b (patch) | |
| tree | b1b8d204cba628580ab7097283c980c56507be14 /calendar | |
| parent | b6f61694d42b65d02d12c268e991fdf8b96f50bf (diff) | |
| download | gsoc2013-evolution-95fe9256305bad92697bf1043efcbd61238cf94b.tar.gz gsoc2013-evolution-95fe9256305bad92697bf1043efcbd61238cf94b.tar.zst gsoc2013-evolution-95fe9256305bad92697bf1043efcbd61238cf94b.zip | |
Fix a crapload of run-time warnings.
EConfig and EMAccountEditor are very, very brittle.
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.c | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/cal-prefs-dialog.ui | 30 |
2 files changed, 12 insertions, 20 deletions
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 179dd25ca2..bf59e37fb9 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -579,7 +579,7 @@ static ECalConfigItem eccp_items[] = { { E_CONFIG_SECTION, (gchar *) "10.display/10.taskList", (gchar *) "taskList", eccp_widget_glade }, { E_CONFIG_PAGE, (gchar *) "15.alarms", (gchar *) "alarms", eccp_widget_glade }, { E_CONFIG_PAGE, (gchar *) "20.freeBusy", (gchar *) "freebusy", eccp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "20.freeBusy/00.defaultServer", (gchar *) "defaultFBServer", eccp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "20.freeBusy/00.defaultServer", (gchar *) "default-freebusy-vbox", eccp_widget_glade }, }; static void diff --git a/calendar/gui/dialogs/cal-prefs-dialog.ui b/calendar/gui/dialogs/cal-prefs-dialog.ui index b94803fc43..6b6218df70 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.ui +++ b/calendar/gui/dialogs/cal-prefs-dialog.ui @@ -1234,9 +1234,10 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox16"> + <object class="GtkVBox" id="alarms"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="label67"> @@ -1319,9 +1320,10 @@ <object class="GtkVBox" id="freebusy"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkLabel" id="label25"> + <object class="GtkLabel" id="default-freebusy-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Default Free/Busy Server</property> @@ -1336,22 +1338,13 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox12"> + <object class="GtkAlignment" id="default-freebusy-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label27"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="vbox7"> + <object class="GtkVBox" id="default-freebusy-vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox18"> @@ -1372,6 +1365,7 @@ <object class="GtkEntry" id="template_url"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="invisible_char">●</property> </object> <packing> <property name="position">1</property> @@ -1398,13 +1392,11 @@ </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -1426,8 +1418,8 @@ </object> <object class="GtkSizeGroup" id="day_begins_ends_sizegroup"> <widgets> - <widget name="day_start_label"/> <widget name="day_end_label"/> + <widget name="day_start_label"/> </widgets> </object> </interface> |