[gedit/wip/appmenu] Add _gedit_app_has_app_menu
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/wip/appmenu] Add _gedit_app_has_app_menu
- Date: Mon, 31 Dec 2012 11:39:49 +0000 (UTC)
commit 9dd9d4daaff30844b5308b9d4224e495cf2c5500
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Mon Dec 31 12:39:35 2012 +0100
Add _gedit_app_has_app_menu
gedit/gedit-app.c | 27 ++++++++++++++++++---------
gedit/gedit-app.h | 2 ++
gedit/gedit-window.c | 10 +---------
3 files changed, 21 insertions(+), 18 deletions(-)
---
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index edb411a..df0c569 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -397,8 +397,6 @@ gedit_app_startup (GApplication *application)
{
GeditApp *app = GEDIT_APP (application);
GtkSourceStyleSchemeManager *manager;
- GtkSettings *gtk_settings;
- gboolean show_app_menu;
const gchar *dir;
gchar *icon_dir;
#ifndef ENABLE_GVFS_METADATA
@@ -450,13 +448,7 @@ gedit_app_startup (GApplication *application)
app->priv->lockdown = gedit_settings_get_lockdown (GEDIT_SETTINGS (app->priv->settings));
/* app menu */
- gtk_settings = gtk_settings_get_default ();
- g_object_get (G_OBJECT (gtk_settings),
- "gtk-shell-shows-app-menu",
- &show_app_menu,
- NULL);
-
- if (show_app_menu)
+ if (_gedit_app_has_app_menu (app))
{
GtkBuilder *builder;
GError *error = NULL;
@@ -1529,4 +1521,21 @@ _gedit_app_get_settings (GeditApp *app)
return app->priv->settings;
}
+gboolean
+_gedit_app_has_app_menu (GeditApp *app)
+{
+ GtkSettings *gtk_settings;
+ gboolean show_app_menu;
+
+ g_return_val_if_fail (GEDIT_IS_APP (app), FALSE);
+
+ gtk_settings = gtk_settings_get_default ();
+ g_object_get (G_OBJECT (gtk_settings),
+ "gtk-shell-shows-app-menu",
+ &show_app_menu,
+ NULL);
+
+ return show_app_menu;
+}
+
/* ex:set ts=8 noet: */
diff --git a/gedit/gedit-app.h b/gedit/gedit-app.h
index fd9d53d..03baa3e 100644
--- a/gedit/gedit-app.h
+++ b/gedit/gedit-app.h
@@ -144,6 +144,8 @@ void _gedit_app_set_default_print_settings (GeditApp *app,
GObject *_gedit_app_get_settings (GeditApp *app);
+gboolean _gedit_app_has_app_menu (GeditApp *app);
+
G_END_DECLS
#endif /* __GEDIT_APP_H__ */
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index e5a6832..11e8214 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -1482,8 +1482,6 @@ create_menu_bar_and_toolbar (GeditWindow *window,
GtkAction *action;
GtkUIManager *manager;
GtkRecentManager *recent_manager;
- GtkSettings *gtk_settings;
- gboolean show_app_menu;
GError *error = NULL;
gedit_debug (DEBUG_WINDOW);
@@ -1568,13 +1566,7 @@ create_menu_bar_and_toolbar (GeditWindow *window,
g_object_unref (action_group);
window->priv->panels_action_group = action_group;
- gtk_settings = gtk_settings_get_default ();
- g_object_get (G_OBJECT (gtk_settings),
- "gtk-shell-shows-app-menu",
- &show_app_menu,
- NULL);
-
- if (show_app_menu)
+ if (_gedit_app_has_app_menu (GEDIT_APP (g_application_get_default ())))
{
gtk_ui_manager_add_ui_from_resource (manager,
"/org/gnome/gedit/ui/gedit-ui.xml",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]