aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-10-31 05:23:17 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-10-31 05:23:17 +0800
commit9c9e85d286fe61ed11e457c737bd26e2732119ab (patch)
tree679122ee40dab37e58709ebbcb1abf995331a11e
parent80e6c5adad4e89846c004efb2029d4db9ec2e64f (diff)
downloadgsoc2013-evolution-9c9e85d286fe61ed11e457c737bd26e2732119ab.tar
gsoc2013-evolution-9c9e85d286fe61ed11e457c737bd26e2732119ab.tar.gz
gsoc2013-evolution-9c9e85d286fe61ed11e457c737bd26e2732119ab.tar.bz2
gsoc2013-evolution-9c9e85d286fe61ed11e457c737bd26e2732119ab.tar.lz
gsoc2013-evolution-9c9e85d286fe61ed11e457c737bd26e2732119ab.tar.xz
gsoc2013-evolution-9c9e85d286fe61ed11e457c737bd26e2732119ab.tar.zst
gsoc2013-evolution-9c9e85d286fe61ed11e457c737bd26e2732119ab.zip
Secondary checkout spotted a compilation issue.
Select the first Preferences page when the window is shown. svn path=/branches/kill-bonobo/; revision=36702
-rw-r--r--calendar/modules/Makefile.am80
-rw-r--r--widgets/misc/e-preferences-window.c12
2 files changed, 89 insertions, 3 deletions
diff --git a/calendar/modules/Makefile.am b/calendar/modules/Makefile.am
new file mode 100644
index 0000000000..8a3cb16322
--- /dev/null
+++ b/calendar/modules/Makefile.am
@@ -0,0 +1,80 @@
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"calendar-modules\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/widgets \
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ $(EVOLUTION_CALENDAR_CFLAGS)
+
+#module_LTLIBRARIES = \
+# libevolution-module-memos.la \
+# libevolution-module-tasks.la
+
+module_LTLIBRARIES = \
+ libevolution-module-calendars.la \
+ libevolution-module-memos.la \
+ libevolution-module-tasks.la
+
+libevolution_module_calendars_la_SOURCES = \
+ e-cal-shell-module.c \
+ e-cal-shell-module-migrate.c \
+ e-cal-shell-module-migrate.h \
+ e-cal-shell-content.c \
+ e-cal-shell-content.h \
+ e-cal-shell-sidebar.c \
+ e-cal-shell-sidebar.h \
+ e-cal-shell-view.c \
+ e-cal-shell-view.h \
+ e-cal-shell-view-actions.c \
+ e-cal-shell-view-actions.h \
+ e-cal-shell-view-memopad.c \
+ e-cal-shell-view-private.c \
+ e-cal-shell-view-private.h \
+ e-cal-shell-view-taskpad.c
+
+libevolution_module_memos_la_SOURCES = \
+ e-memo-shell-module.c \
+ e-memo-shell-module-migrate.c \
+ e-memo-shell-module-migrate.h \
+ e-memo-shell-content.c \
+ e-memo-shell-content.h \
+ e-memo-shell-sidebar.c \
+ e-memo-shell-sidebar.h \
+ e-memo-shell-view.c \
+ e-memo-shell-view.h \
+ e-memo-shell-view-actions.c \
+ e-memo-shell-view-actions.h \
+ e-memo-shell-view-private.c \
+ e-memo-shell-view-private.h
+
+libevolution_module_tasks_la_SOURCES = \
+ e-task-shell-module.c \
+ e-task-shell-module-migrate.c \
+ e-task-shell-module-migrate.h \
+ e-task-shell-content.c \
+ e-task-shell-content.h \
+ e-task-shell-sidebar.c \
+ e-task-shell-sidebar.h \
+ e-task-shell-view.c \
+ e-task-shell-view.h \
+ e-task-shell-view-actions.c \
+ e-task-shell-view-actions.h \
+ e-task-shell-view-private.c \
+ e-task-shell-view-private.h
+
+# Removed from all three
+# $(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la
+
+libevolution_module_calendars_la_LIBADD = \
+ $(WIN32_BOOTSTRAP_LIBS) \
+ $(top_builddir)/shell/libeshell.la \
+ $(top_builddir)/calendar/gui/libcal-gui.la
+
+libevolution_module_memos_la_LIBADD = \
+ $(WIN32_BOOTSTRAP_LIBS) \
+ $(top_builddir)/shell/libeshell.la \
+ $(top_builddir)/calendar/gui/libcal-gui.la
+
+libevolution_module_tasks_la_LIBADD = \
+ $(WIN32_BOOTSTRAP_LIBS) \
+ $(top_builddir)/shell/libeshell.la \
+ $(top_builddir)/calendar/gui/libcal-gui.la
diff --git a/widgets/misc/e-preferences-window.c b/widgets/misc/e-preferences-window.c
index 1235ebbad8..ecdbee1402 100644
--- a/widgets/misc/e-preferences-window.c
+++ b/widgets/misc/e-preferences-window.c
@@ -154,9 +154,18 @@ static void
preferences_window_show (GtkWidget *widget)
{
EPreferencesWindowPrivate *priv;
+ GtkIconView *icon_view;
+ GtkTreePath *path;
priv = E_PREFERENCES_WINDOW_GET_PRIVATE (widget);
+ icon_view = GTK_ICON_VIEW (priv->icon_view);
+
+ path = gtk_tree_path_new_first ();
+ gtk_icon_view_select_path (icon_view, path);
+ gtk_icon_view_scroll_to_path (icon_view, path, FALSE, 0.0, 0.0);
+ gtk_tree_path_free (path);
+
gtk_widget_grab_focus (priv->icon_view);
/* Chain up to parent's show() method. */
@@ -360,9 +369,6 @@ e_preferences_window_add_page (EPreferencesWindow *window,
gtk_widget_show (widget);
gtk_notebook_append_page (notebook, widget, NULL);
-
- if (page == 0)
- e_preferences_window_show_page (window, page_name);
}
void