debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make property strings static to save some memory

Browse source
This commit is contained in:
Nick Schermer 2009-01-16 05:19:43 +01:00 committed by Christian Dywan
parent 8f2c5befb2
commit f02f9fd118
10 changed files with 71 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/compat.h
View file

@ -17,6 +17,12 @@
#endif #endif
#include <glib.h> #include <glib.h>
#if !GLIB_CHECK_VERSION (2, 14, 0)
#define G_PARAM_STATIC_STRINGS \
(G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
#endif
#if GLIB_CHECK_VERSION (2, 16, 0) #if GLIB_CHECK_VERSION (2, 16, 0)
#include <gio/gio.h> #include <gio/gio.h>
#endif #endif

16
midori/midori-app.c
View file

@ -211,7 +211,7 @@ midori_app_class_init (MidoriAppClass* class)
"Settings", "Settings",
"The associated settings", "The associated settings",
MIDORI_TYPE_WEB_SETTINGS, MIDORI_TYPE_WEB_SETTINGS,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_BOOKMARKS, PROP_BOOKMARKS,
@ -220,7 +220,7 @@ midori_app_class_init (MidoriAppClass* class)
"Bookmarks", "Bookmarks",
"The bookmarks folder, containing all bookmarks", "The bookmarks folder, containing all bookmarks",
KATZE_TYPE_ARRAY, KATZE_TYPE_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_TRASH, PROP_TRASH,
@ -229,7 +229,7 @@ midori_app_class_init (MidoriAppClass* class)
"Trash", "Trash",
"The trash, collecting recently closed tabs and windows", "The trash, collecting recently closed tabs and windows",
KATZE_TYPE_ARRAY, KATZE_TYPE_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SEARCH_ENGINES, PROP_SEARCH_ENGINES,
@ -238,7 +238,7 @@ midori_app_class_init (MidoriAppClass* class)
"Search Engines", "Search Engines",
"The list of search engines", "The list of search engines",
KATZE_TYPE_ARRAY, KATZE_TYPE_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_HISTORY, PROP_HISTORY,
@ -247,7 +247,7 @@ midori_app_class_init (MidoriAppClass* class)
"History", "History",
"The list of history items", "The list of history items",
KATZE_TYPE_ARRAY, KATZE_TYPE_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_EXTENSIONS, PROP_EXTENSIONS,
@ -256,7 +256,7 @@ midori_app_class_init (MidoriAppClass* class)
"Extensions", "Extensions",
"The list of extensions", "The list of extensions",
KATZE_TYPE_ARRAY, KATZE_TYPE_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_BROWSER, PROP_BROWSER,
@ -265,7 +265,7 @@ midori_app_class_init (MidoriAppClass* class)
"Browser", "Browser",
"The current browser", "The current browser",
MIDORI_TYPE_BROWSER, MIDORI_TYPE_BROWSER,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_BROWSER_COUNT, PROP_BROWSER_COUNT,
@ -274,7 +274,7 @@ midori_app_class_init (MidoriAppClass* class)
"Browser Count", "Browser Count",
"The current number of browsers", "The current number of browsers",
0, G_MAXUINT, 0, 0, G_MAXUINT, 0,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
} }
#if HAVE_UNIQUE #if HAVE_UNIQUE

26
midori/midori-browser.c
View file

@ -1078,7 +1078,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
gobject_class->set_property = midori_browser_set_property; gobject_class->set_property = midori_browser_set_property;
gobject_class->get_property = midori_browser_get_property; gobject_class->get_property = midori_browser_get_property;
flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS;
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_MENUBAR, PROP_MENUBAR,
@ -1087,7 +1087,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"Menubar", "Menubar",
"The menubar", "The menubar",
GTK_TYPE_MENU_BAR, GTK_TYPE_MENU_BAR,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_NAVIGATIONBAR, PROP_NAVIGATIONBAR,
@ -1096,7 +1096,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"Navigationbar", "Navigationbar",
"The navigationbar", "The navigationbar",
GTK_TYPE_TOOLBAR, GTK_TYPE_TOOLBAR,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_NOTEBOOK, PROP_NOTEBOOK,
@ -1105,7 +1105,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"Notebook", "Notebook",
"The notebook containing the views", "The notebook containing the views",
GTK_TYPE_NOTEBOOK, GTK_TYPE_NOTEBOOK,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_PANEL, PROP_PANEL,
@ -1114,7 +1114,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"Panel", "Panel",
"The side panel embedded in the browser", "The side panel embedded in the browser",
MIDORI_TYPE_PANEL, MIDORI_TYPE_PANEL,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_URI, PROP_URI,
@ -1123,7 +1123,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"URI", "URI",
"The current URI", "The current URI",
"about:blank", "about:blank",
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_TAB, PROP_TAB,
@ -1132,7 +1132,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"Tab", "Tab",
"The current tab", "The current tab",
GTK_TYPE_WIDGET, GTK_TYPE_WIDGET,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_LOAD_STATUS, PROP_LOAD_STATUS,
@ -1142,7 +1142,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"The current load status", "The current load status",
MIDORI_TYPE_LOAD_STATUS, MIDORI_TYPE_LOAD_STATUS,
MIDORI_LOAD_FINISHED, MIDORI_LOAD_FINISHED,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_STATUSBAR, PROP_STATUSBAR,
@ -1151,7 +1151,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"Statusbar", "Statusbar",
"The statusbar", "The statusbar",
GTK_TYPE_STATUSBAR, GTK_TYPE_STATUSBAR,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
/** /**
* MidoriBrowser:statusbar-text: * MidoriBrowser:statusbar-text:
@ -1190,7 +1190,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"Settings", "Settings",
"The associated settings", "The associated settings",
MIDORI_TYPE_WEB_SETTINGS, MIDORI_TYPE_WEB_SETTINGS,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/** /**
* MidoriBrowser:bookmarks: * MidoriBrowser:bookmarks:
@ -1207,7 +1207,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"Bookmarks", "Bookmarks",
"The bookmarks folder, containing all bookmarks", "The bookmarks folder, containing all bookmarks",
KATZE_TYPE_ARRAY, KATZE_TYPE_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/** /**
* MidoriBrowser:trash: * MidoriBrowser:trash:
@ -1226,7 +1226,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"Trash", "Trash",
"The trash, collecting recently closed tabs and windows", "The trash, collecting recently closed tabs and windows",
KATZE_TYPE_ARRAY, KATZE_TYPE_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/** /**
* MidoriBrowser:search-engines: * MidoriBrowser:search-engines:
@ -1243,7 +1243,7 @@ midori_browser_class_init (MidoriBrowserClass* class)
"Search Engines", "Search Engines",
"The list of search engines to be used for web search", "The list of search engines to be used for web search",
KATZE_TYPE_ARRAY, KATZE_TYPE_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/** /**
* MidoriBrowser:history: * MidoriBrowser:history:

2
midori/midori-extension.c
View file

@ -99,7 +99,7 @@ midori_extension_class_init (MidoriExtensionClass* class)
gobject_class->set_property = midori_extension_set_property; gobject_class->set_property = midori_extension_set_property;
gobject_class->get_property = midori_extension_get_property; gobject_class->get_property = midori_extension_get_property;
flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS;
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_NAME, PROP_NAME,

4
midori/midori-locationaction.c
View file

@ -168,7 +168,7 @@ midori_location_action_class_init (MidoriLocationActionClass* class)
"Progress", "Progress",
"The current progress of the action", "The current progress of the action",
0.0, 1.0, 0.0, 0.0, 1.0, 0.0,
G_PARAM_WRITABLE)); G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SECONDARY_ICON, PROP_SECONDARY_ICON,
@ -177,7 +177,7 @@ midori_location_action_class_init (MidoriLocationActionClass* class)
"Secondary", "Secondary",
"The stock ID of the secondary icon", "The stock ID of the secondary icon",
NULL, NULL,
G_PARAM_WRITABLE)); G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
} }
static void static void

4
midori/midori-panel.c
View file

@ -118,7 +118,7 @@ midori_panel_class_init (MidoriPanelClass* class)
class->close = midori_panel_close; class->close = midori_panel_close;
flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS;
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SHADOW_TYPE, PROP_SHADOW_TYPE,
@ -137,7 +137,7 @@ midori_panel_class_init (MidoriPanelClass* class)
"Menu", "Menu",
"Menu to hold panel items", "Menu to hold panel items",
GTK_TYPE_MENU, GTK_TYPE_MENU,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_PAGE, PROP_PAGE,

2
midori/midori-preferences.c
View file

@ -70,7 +70,7 @@ midori_preferences_class_init (MidoriPreferencesClass* class)
"Settings", "Settings",
"Settings instance to provide properties", "Settings instance to provide properties",
MIDORI_TYPE_WEB_SETTINGS, MIDORI_TYPE_WEB_SETTINGS,
G_PARAM_WRITABLE)); G_PARAM_WRITABLE | G_PARAM_STATIC_STRINGS));
} }
static void static void

8
midori/midori-searchaction.c
View file

@ -136,7 +136,7 @@ midori_search_action_class_init (MidoriSearchActionClass* class)
"Search Engines", "Search Engines",
"The list of search engines", "The list of search engines",
KATZE_TYPE_ARRAY, KATZE_TYPE_ARRAY,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_CURRENT_ITEM, PROP_CURRENT_ITEM,
@ -145,7 +145,7 @@ midori_search_action_class_init (MidoriSearchActionClass* class)
"Current Item", "Current Item",
"The currently selected item", "The currently selected item",
KATZE_TYPE_ITEM, KATZE_TYPE_ITEM,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_TEXT, PROP_TEXT,
@ -154,7 +154,7 @@ midori_search_action_class_init (MidoriSearchActionClass* class)
"Text", "Text",
"The current text typed in the entry", "The current text typed in the entry",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_DIALOG, PROP_DIALOG,
@ -163,7 +163,7 @@ midori_search_action_class_init (MidoriSearchActionClass* class)
"Dialog", "Dialog",
"A dialog to manage search engines", "A dialog to manage search engines",
GTK_TYPE_DIALOG, GTK_TYPE_DIALOG,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
} }
static void static void

20
midori/midori-view.c
View file

@ -305,7 +305,7 @@ midori_view_class_init (MidoriViewClass* class)
gobject_class->set_property = midori_view_set_property; gobject_class->set_property = midori_view_set_property;
gobject_class->get_property = midori_view_get_property; gobject_class->get_property = midori_view_get_property;
flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS;
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_URI, PROP_URI,
@ -314,7 +314,7 @@ midori_view_class_init (MidoriViewClass* class)
"Uri", "Uri",
"The URI of the currently loaded page", "The URI of the currently loaded page",
"about:blank", "about:blank",
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_TITLE, PROP_TITLE,
@ -323,7 +323,7 @@ midori_view_class_init (MidoriViewClass* class)
"Title", "Title",
"The title of the currently loaded page", "The title of the currently loaded page",
NULL, NULL,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/** /**
* MidoriView:mime-type: * MidoriView:mime-type:
@ -339,7 +339,7 @@ midori_view_class_init (MidoriViewClass* class)
"MIME Type", "MIME Type",
"The MIME type of the currently loaded page", "The MIME type of the currently loaded page",
"text/html", "text/html",
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_ICON, PROP_ICON,
@ -348,7 +348,7 @@ midori_view_class_init (MidoriViewClass* class)
"Icon", "Icon",
"The icon of the view", "The icon of the view",
GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_LOAD_STATUS, PROP_LOAD_STATUS,
@ -358,7 +358,7 @@ midori_view_class_init (MidoriViewClass* class)
"The current loading status", "The current loading status",
MIDORI_TYPE_LOAD_STATUS, MIDORI_TYPE_LOAD_STATUS,
MIDORI_LOAD_FINISHED, MIDORI_LOAD_FINISHED,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_PROGRESS, PROP_PROGRESS,
@ -367,7 +367,7 @@ midori_view_class_init (MidoriViewClass* class)
"Progress", "Progress",
"The current loading progress", "The current loading progress",
0.0, 1.0, 0.0, 0.0, 1.0, 0.0,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_ZOOM_LEVEL, PROP_ZOOM_LEVEL,
@ -378,7 +378,7 @@ midori_view_class_init (MidoriViewClass* class)
G_MINFLOAT, G_MINFLOAT,
G_MAXFLOAT, G_MAXFLOAT,
1.0f, 1.0f,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
/* g_object_class_install_property (gobject_class, /* g_object_class_install_property (gobject_class,
PROP_NEWS_FEEDS, PROP_NEWS_FEEDS,
@ -387,7 +387,7 @@ midori_view_class_init (MidoriViewClass* class)
"News Feeds", "News Feeds",
"The list of available news feeds", "The list of available news feeds",
KATZE_TYPE_ARRAY, KATZE_TYPE_ARRAY,
G_PARAM_READWRITE)); */ G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); */
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_STATUSBAR_TEXT, PROP_STATUSBAR_TEXT,
@ -396,7 +396,7 @@ midori_view_class_init (MidoriViewClass* class)
"Statusbar Text", "Statusbar Text",
"The text displayed in the statusbar", "The text displayed in the statusbar",
"", "",
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_SETTINGS, PROP_SETTINGS,

47
midori/midori-websettings.c
View file

@ -274,7 +274,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
gobject_class->set_property = midori_web_settings_set_property; gobject_class->set_property = midori_web_settings_set_property;
gobject_class->get_property = midori_web_settings_get_property; gobject_class->get_property = midori_web_settings_get_property;
flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT; flags = G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_STATIC_STRINGS;
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_REMEMBER_LAST_WINDOW_SIZE, PROP_REMEMBER_LAST_WINDOW_SIZE,
@ -516,8 +516,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Where to open new pages"), _("Where to open new pages"),
MIDORI_TYPE_NEW_PAGE, MIDORI_TYPE_NEW_PAGE,
MIDORI_NEW_PAGE_TAB, MIDORI_NEW_PAGE_TAB,
g_signal_lookup ("create-web-view", WEBKIT_TYPE_WEB_VIEW) (g_signal_lookup ("create-web-view", WEBKIT_TYPE_WEB_VIEW)
? G_PARAM_READWRITE : G_PARAM_READABLE)); ? G_PARAM_READWRITE : G_PARAM_READABLE) | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_OPEN_EXTERNAL_PAGES_IN, PROP_OPEN_EXTERNAL_PAGES_IN,
@ -528,9 +528,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
MIDORI_TYPE_NEW_PAGE, MIDORI_TYPE_NEW_PAGE,
MIDORI_NEW_PAGE_TAB, MIDORI_NEW_PAGE_TAB,
#if HAVE_UNIQUE #if HAVE_UNIQUE
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#else #else
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
#endif #endif
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
@ -567,7 +567,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Open popups in tabs"), _("Open popups in tabs"),
_("Whether to open popup windows in tabs"), _("Whether to open popup windows in tabs"),
TRUE, TRUE,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
if (!g_object_class_find_property (gobject_class, "enforce-96-dpi")) if (!g_object_class_find_property (gobject_class, "enforce-96-dpi"))
@ -585,7 +585,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
"Enforce 96 DPI", "Enforce 96 DPI",
"Whether to enforce a resolution of 96 DPI", "Whether to enforce a resolution of 96 DPI",
FALSE, FALSE,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
if (!g_object_class_find_property (gobject_class, "enable-developer-extras")) if (!g_object_class_find_property (gobject_class, "enable-developer-extras"))
/** /**
@ -602,7 +602,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
"Enable Developer Extras", "Enable Developer Extras",
"Whether to enable extra developer tools", "Whether to enable extra developer tools",
FALSE, FALSE,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
if (!g_object_class_find_property (gobject_class, "zoom-text-and-images")) if (!g_object_class_find_property (gobject_class, "zoom-text-and-images"))
/** /**
@ -619,8 +619,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Zoom Text and Images"), _("Zoom Text and Images"),
_("Whether to zoom text and images"), _("Whether to zoom text and images"),
FALSE, FALSE,
g_object_class_find_property (g_type_class_ref (WEBKIT_TYPE_WEB_VIEW), (g_object_class_find_property (g_type_class_ref (WEBKIT_TYPE_WEB_VIEW),
"full-content-zoom") ? G_PARAM_READWRITE : G_PARAM_READABLE)); "full-content-zoom") ? G_PARAM_READWRITE : G_PARAM_READABLE)
| G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_ACCEPT_COOKIES, PROP_ACCEPT_COOKIES,
@ -631,9 +632,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
MIDORI_TYPE_ACCEPT_COOKIES, MIDORI_TYPE_ACCEPT_COOKIES,
MIDORI_ACCEPT_COOKIES_ALL, MIDORI_ACCEPT_COOKIES_ALL,
#if HAVE_LIBSOUP #if HAVE_LIBSOUP
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#else #else
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
#endif #endif
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
@ -643,7 +644,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Original cookies only"), _("Original cookies only"),
_("Accept cookies from the original website only"), _("Accept cookies from the original website only"),
FALSE, FALSE,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_MAXIMUM_COOKIE_AGE, PROP_MAXIMUM_COOKIE_AGE,
@ -652,7 +653,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Maximum cookie age"), _("Maximum cookie age"),
_("The maximum number of days to save cookies for"), _("The maximum number of days to save cookies for"),
0, G_MAXINT, 30, 0, G_MAXINT, 30,
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
@ -681,7 +682,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Remember last form inputs"), _("Remember last form inputs"),
_("Whether the last form inputs are saved"), _("Whether the last form inputs are saved"),
TRUE, TRUE,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_REMEMBER_LAST_DOWNLOADED_FILES, PROP_REMEMBER_LAST_DOWNLOADED_FILES,
@ -690,7 +691,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Remember last downloaded files"), _("Remember last downloaded files"),
_("Whether the last downloaded files are saved"), _("Whether the last downloaded files are saved"),
TRUE, TRUE,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
@ -702,9 +703,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("The proxy server used for HTTP connections"), _("The proxy server used for HTTP connections"),
NULL, NULL,
#if HAVE_LIBSOUP #if HAVE_LIBSOUP
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#else #else
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
#endif #endif
/** /**
@ -724,9 +725,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
MIDORI_TYPE_IDENTITY, MIDORI_TYPE_IDENTITY,
MIDORI_IDENT_MIDORI, MIDORI_IDENT_MIDORI,
#if HAVE_LIBSOUP #if HAVE_LIBSOUP
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#else #else
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
#endif #endif
/** /**
@ -744,9 +745,9 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("The application identification string"), _("The application identification string"),
NULL, NULL,
#if HAVE_LIBSOUP #if HAVE_LIBSOUP
G_PARAM_READWRITE)); G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
#else #else
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
#endif #endif
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
@ -756,7 +757,7 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
_("Cache size"), _("Cache size"),
_("The allowed size of the cache"), _("The allowed size of the cache"),
0, G_MAXINT, 100, 0, G_MAXINT, 100,
G_PARAM_READABLE)); G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
} }
static void static void