[glom] update_network_shared_ui(): Un-ifndef this for
- From: Murray Cumming <murrayc src gnome org>
- To: svn-commits-list gnome org
- Subject: [glom] update_network_shared_ui(): Un-ifndef this for
- Date: Sun, 5 Jul 2009 09:56:44 +0000 (UTC)
commit 2a698e2b0854e25ab9bc5d764078dc82e1629afe
Author: Murray Cumming <murrayc murrayc com>
Date: Sun Jul 5 11:48:49 2009 +0200
update_network_shared_ui(): Un-ifndef this for
client-only.
ChangeLog | 5 +++++
glom/application.cc | 17 +++++++++--------
2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a081da2..2c5a691 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-05 Murray Cumming <murrayc murrayc-x61>
+
+ * glom/application.cc: update_network_shared_ui(): Un-ifndef this for
+ client-only.
+
2009-07-05 Murray Cumming <murrayc murrayc com>
* glom/*.[h|cc]: Move some ifndefs around to fix the client-only build.
diff --git a/glom/application.cc b/glom/application.cc
index 02db9ac..4fb96f5 100644
--- a/glom/application.cc
+++ b/glom/application.cc
@@ -805,9 +805,9 @@ void App_Glom::open_browsed_document(const EpcServiceInfo* server, const Glib::u
document->set_userlevel(AppState::USERLEVEL_OPERATOR); //TODO: This should happen automatically.
document->set_network_shared(true); //It is shared by the computer that we opened this from.
+ update_network_shared_ui();
#ifndef GLOM_ENABLE_CLIENT_ONLY
- update_network_shared_ui(); //TODO: Maybe we should show this for client-only mode too.
update_userlevel_ui();
#endif // !GLOM_ENABLE_CLIENT_ONLY
@@ -1174,9 +1174,10 @@ bool App_Glom::on_document_load()
//List the non-hidden tables in the menu:
fill_menu_tables();
-#ifndef GLOM_ENABLE_CLIENT_ONLY
update_network_shared_ui();
+#ifndef GLOM_ENABLE_CLIENT_ONLY
+
pDocument->set_allow_autosave(true);
#endif // !GLOM_ENABLE_CLIENT_ONLY
@@ -1215,12 +1216,6 @@ void App_Glom::statusbar_clear()
*/
-#ifndef GLOM_ENABLE_CLIENT_ONLY
-void App_Glom::on_userlevel_changed(AppState::userlevels /* userlevel */)
-{
- update_userlevel_ui();
-}
-
void App_Glom::update_network_shared_ui()
{
Document* document = dynamic_cast<Document*>(get_document());
@@ -1245,6 +1240,12 @@ void App_Glom::update_network_shared_ui()
m_connection_toggleaction_network_shared.unblock();
}
+#ifndef GLOM_ENABLE_CLIENT_ONLY
+void App_Glom::on_userlevel_changed(AppState::userlevels /* userlevel */)
+{
+ update_userlevel_ui();
+}
+
void App_Glom::update_userlevel_ui()
{
AppState::userlevels userlevel = get_userlevel();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]