Updating branch refs/heads/master
to 36051c8fbc53e9f937b007928314676eac1ff94a (commit)
from 321ff87ecd1cdbb9e9c0d4b6cc9c16b7c8f0b4e1 (commit)
commit 36051c8fbc53e9f937b007928314676eac1ff94a
Author: Nick Schermer <nick at xfce.org>
Date: Sun Aug 16 12:22:27 2009 +0200
Use G_PARAM_STATIC_STRINGS for properties.
garcon/garcon-menu-directory.c | 13 +++++++++----
garcon/garcon-menu-item.c | 36 ++++++++++++++++++++++++------------
garcon/garcon-menu-merger.c | 4 +++-
garcon/garcon-menu-node.c | 3 ++-
garcon/garcon-menu-parser.c | 5 +++--
garcon/garcon-menu.c | 7 +++++--
6 files changed, 46 insertions(+), 22 deletions(-)
diff --git a/garcon/garcon-menu-directory.c b/garcon/garcon-menu-directory.c
index 4fa54b0..55a776b 100644
--- a/garcon/garcon-menu-directory.c
+++ b/garcon/garcon-menu-directory.c
@@ -168,6 +168,7 @@ garcon_menu_directory_class_init (GarconMenuDirectoryClass *klass)
"File",
G_TYPE_FILE,
G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS |
G_PARAM_CONSTRUCT_ONLY));
/**
@@ -181,7 +182,8 @@ garcon_menu_directory_class_init (GarconMenuDirectoryClass *klass)
"Name",
"Directory name",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuDirectory:comment:
@@ -194,7 +196,8 @@ garcon_menu_directory_class_init (GarconMenuDirectoryClass *klass)
"Description",
"Directory description",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuDirectory:icon:
@@ -207,7 +210,8 @@ garcon_menu_directory_class_init (GarconMenuDirectoryClass *klass)
"Icon",
"Directory icon",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuDirectory:no-display:
@@ -220,7 +224,8 @@ garcon_menu_directory_class_init (GarconMenuDirectoryClass *klass)
"No Display",
"Visibility state of the related menu",
FALSE,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
}
diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
index 6bc2fa8..e309f72 100644
--- a/garcon/garcon-menu-item.c
+++ b/garcon/garcon-menu-item.c
@@ -171,7 +171,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"Desktop-File Id",
"Desktop-File Id of the application",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuItem:filename:
@@ -185,7 +186,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"Filename",
"Absolute filename",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuItem:requires-terminal:
@@ -198,7 +200,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"Requires a terminal",
"Whether this application requires a terminal",
FALSE,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuItem:no-display:
@@ -211,7 +214,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"No Display",
"Visibility state of the menu item",
FALSE,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuItem:startup-notification:
@@ -224,7 +228,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"Startup notification",
"Startup notification support",
FALSE,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuItem:name:
@@ -237,7 +242,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"Name",
"Name of the application",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuItem:generic-name:
@@ -250,7 +256,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"Generic name",
"Generic name of the application",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuItem:comment:
@@ -264,7 +271,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"Comment",
"Comment/description for the application",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuItem:command:
@@ -277,7 +285,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"Command",
"Application command",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuItem:try-exec:
@@ -290,7 +299,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"TryExec",
"TryExec",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuItem:icon-name:
@@ -303,7 +313,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"Icon name",
"Name of the application icon",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
/**
* GarconMenuItem:path:
@@ -316,7 +327,8 @@ garcon_menu_item_class_init (GarconMenuItemClass *klass)
"Path",
"Working directory path",
NULL,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
}
diff --git a/garcon/garcon-menu-merger.c b/garcon/garcon-menu-merger.c
index ac153d6..a50d551 100644
--- a/garcon/garcon-menu-merger.c
+++ b/garcon/garcon-menu-merger.c
@@ -127,7 +127,9 @@ garcon_menu_merger_class_init (GarconMenuMergerClass *klass)
"tree-provider",
"tree-provider",
GARCON_TYPE_MENU_TREE_PROVIDER,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS |
+ G_PARAM_CONSTRUCT_ONLY));
}
diff --git a/garcon/garcon-menu-node.c b/garcon/garcon-menu-node.c
index 8faf52d..d232b18 100644
--- a/garcon/garcon-menu-node.c
+++ b/garcon/garcon-menu-node.c
@@ -150,7 +150,8 @@ garcon_menu_node_class_init (GarconMenuNodeClass *klass)
"node-type",
garcon_menu_node_type_get_type (),
GARCON_MENU_NODE_TYPE_MENU,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
}
diff --git a/garcon/garcon-menu-parser.c b/garcon/garcon-menu-parser.c
index a10104a..595ea95 100644
--- a/garcon/garcon-menu-parser.c
+++ b/garcon/garcon-menu-parser.c
@@ -155,8 +155,9 @@ garcon_menu_parser_class_init (GarconMenuParserClass *klass)
"file",
"file",
G_TYPE_FILE,
- G_PARAM_READWRITE
- | G_PARAM_CONSTRUCT_ONLY));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS |
+ G_PARAM_CONSTRUCT_ONLY));
}
diff --git a/garcon/garcon-menu.c b/garcon/garcon-menu.c
index 7988aa3..c95596e 100644
--- a/garcon/garcon-menu.c
+++ b/garcon/garcon-menu.c
@@ -196,7 +196,9 @@ garcon_menu_class_init (GarconMenuClass *klass)
"file",
"file",
G_TYPE_FILE,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS |
+ G_PARAM_CONSTRUCT_ONLY));
/**
* GarconMenu:directory:
@@ -209,7 +211,8 @@ garcon_menu_class_init (GarconMenuClass *klass)
"Directory",
"Directory entry associated with this menu",
GARCON_TYPE_MENU_DIRECTORY,
- G_PARAM_READWRITE));
+ G_PARAM_READWRITE |
+ G_PARAM_STATIC_STRINGS));
}