Merge lp:~3v1n0/libappindicator/g-ir-scanner-docs into lp:libappindicator
- g-ir-scanner-docs
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Ted Gould |
Approved revision: | 219 |
Merged at revision: | 213 |
Proposed branch: | lp:~3v1n0/libappindicator/g-ir-scanner-docs |
Merge into: | lp:libappindicator |
Prerequisite: | lp:~3v1n0/libappindicator/secondary-activate-support |
Diff against target: |
1387 lines (+490/-492) 3 files modified
src/Makefile.am (+1/-0) src/app-indicator.c (+350/-353) src/app-indicator.h (+139/-139) |
To merge this branch: | bzr merge lp:~3v1n0/libappindicator/g-ir-scanner-docs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ted Gould (community) | Approve | ||
Review via email: mp+68560@code.launchpad.net |
Commit message
Description of the change
When compiling libappindicator you get some g-ir-scanner warnings:
GISCAN AppIndicator3-
app-indicator.
app-indicator.
This is due to the fact that the app-indicator.c is not scanned and the comments there don't use a syntax that the scanner recognize... This branch fixes this issue, moving all the GTK-doc comments to the standard syntax.
PS: As important side-effect of this warning, the mentioned functions aren't (were not) available in gir based bindings such as Vala.
Marco Trevisan (Treviño) (3v1n0) wrote : | # |
Eh, unfortunately that's the only format that it seems to recognize, but to get nice bindings with low effort this is the way to write comments! :)
Preview Diff
1 | === modified file 'src/Makefile.am' | |||
2 | --- src/Makefile.am 2011-02-11 04:04:25 +0000 | |||
3 | +++ src/Makefile.am 2011-07-20 15:29:24 +0000 | |||
4 | @@ -148,6 +148,7 @@ | |||
5 | 148 | if HAVE_INTROSPECTION | 148 | if HAVE_INTROSPECTION |
6 | 149 | 149 | ||
7 | 150 | introspection_sources = \ | 150 | introspection_sources = \ |
8 | 151 | $(addprefix $(srcdir)/,app-indicator.c) \ | ||
9 | 151 | $(addprefix $(srcdir)/,$(libappindicator_headers)) | 152 | $(addprefix $(srcdir)/,$(libappindicator_headers)) |
10 | 152 | 153 | ||
11 | 153 | AppIndicator$(VER)-0.1.gir: libappindicator$(VER).la | 154 | AppIndicator$(VER)-0.1.gir: libappindicator$(VER).la |
12 | 154 | 155 | ||
13 | === modified file 'src/app-indicator.c' | |||
14 | --- src/app-indicator.c 2011-07-20 15:29:24 +0000 | |||
15 | +++ src/app-indicator.c 2011-07-20 15:29:24 +0000 | |||
16 | @@ -51,20 +51,18 @@ | |||
17 | 51 | #define PANEL_ICON_SUFFIX "panel" | 51 | #define PANEL_ICON_SUFFIX "panel" |
18 | 52 | 52 | ||
19 | 53 | /** | 53 | /** |
34 | 54 | AppIndicatorPrivate: | 54 | * AppIndicatorPrivate: |
35 | 55 | 55 | * All of the private data in an instance of an application indicator. | |
36 | 56 | All of the private data in an instance of a | 56 | * |
37 | 57 | application indicator. | 57 | * Private Fields |
38 | 58 | */ | 58 | * @id: The ID of the indicator. Maps to AppIndicator:id. |
39 | 59 | /* Private Fields | 59 | * @category: Which category the indicator is. Maps to AppIndicator:category. |
40 | 60 | @id: The ID of the indicator. Maps to AppIndicator:id. | 60 | * @status: The status of the indicator. Maps to AppIndicator:status. |
41 | 61 | @category: Which category the indicator is. Maps to AppIndicator:category. | 61 | * @icon_name: The name of the icon to use. Maps to AppIndicator:icon-name. |
42 | 62 | @status: The status of the indicator. Maps to AppIndicator:status. | 62 | * @attention_icon_name: The name of the attention icon to use. Maps to AppIndicator:attention-icon-name. |
43 | 63 | @icon_name: The name of the icon to use. Maps to AppIndicator:icon-name. | 63 | * @menu: The menu for this indicator. Maps to AppIndicator:menu |
44 | 64 | @attention_icon_name: The name of the attention icon to use. Maps to AppIndicator:attention-icon-name. | 64 | * @watcher_proxy: The proxy connection to the watcher we're connected to. If we're not connected to one this will be %NULL. |
45 | 65 | @menu: The menu for this indicator. Maps to AppIndicator:menu | 65 | */ |
32 | 66 | @watcher_proxy: The proxy connection to the watcher we're connected to. If we're not connected to one this will be %NULL. | ||
33 | 67 | */ | ||
46 | 68 | struct _AppIndicatorPrivate { | 66 | struct _AppIndicatorPrivate { |
47 | 69 | /*< Private >*/ | 67 | /*< Private >*/ |
48 | 70 | /* Properties */ | 68 | /* Properties */ |
49 | @@ -225,11 +223,11 @@ | |||
50 | 225 | /* Properties */ | 223 | /* Properties */ |
51 | 226 | 224 | ||
52 | 227 | /** | 225 | /** |
58 | 228 | AppIndicator:id: | 226 | * AppIndicator:id: |
59 | 229 | 227 | * | |
60 | 230 | The ID for this indicator, which should be unique, but used consistently | 228 | * The ID for this indicator, which should be unique, but used consistently |
61 | 231 | by this program and its indicator. | 229 | * by this program and its indicator. |
62 | 232 | */ | 230 | */ |
63 | 233 | g_object_class_install_property (object_class, | 231 | g_object_class_install_property (object_class, |
64 | 234 | PROP_ID, | 232 | PROP_ID, |
65 | 235 | g_param_spec_string(PROP_ID_S, | 233 | g_param_spec_string(PROP_ID_S, |
66 | @@ -239,11 +237,11 @@ | |||
67 | 239 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY)); | 237 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY)); |
68 | 240 | 238 | ||
69 | 241 | /** | 239 | /** |
75 | 242 | AppIndicator:category: | 240 | * AppIndicator:category: |
76 | 243 | 241 | * | |
77 | 244 | The type of indicator that this represents. Please don't use 'Other'. | 242 | * The type of indicator that this represents. Please don't use 'Other'. |
78 | 245 | Defaults to 'ApplicationStatus'. | 243 | * Defaults to 'ApplicationStatus'. |
79 | 246 | */ | 244 | */ |
80 | 247 | g_object_class_install_property (object_class, | 245 | g_object_class_install_property (object_class, |
81 | 248 | PROP_CATEGORY, | 246 | PROP_CATEGORY, |
82 | 249 | g_param_spec_string (PROP_CATEGORY_S, | 247 | g_param_spec_string (PROP_CATEGORY_S, |
83 | @@ -253,11 +251,11 @@ | |||
84 | 253 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY)); | 251 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT_ONLY)); |
85 | 254 | 252 | ||
86 | 255 | /** | 253 | /** |
92 | 256 | AppIndicator:status: | 254 | * AppIndicator: |
93 | 257 | 255 | * | |
94 | 258 | Whether the indicator is shown or requests attention. Defaults to | 256 | * Whether the indicator is shown or requests attention. Defaults to |
95 | 259 | 'Passive'. | 257 | * 'Passive'. |
96 | 260 | */ | 258 | */ |
97 | 261 | g_object_class_install_property (object_class, | 259 | g_object_class_install_property (object_class, |
98 | 262 | PROP_STATUS, | 260 | PROP_STATUS, |
99 | 263 | g_param_spec_string (PROP_STATUS_S, | 261 | g_param_spec_string (PROP_STATUS_S, |
100 | @@ -267,10 +265,10 @@ | |||
101 | 267 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | 265 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); |
102 | 268 | 266 | ||
103 | 269 | /** | 267 | /** |
108 | 270 | AppIndicator:icon-name: | 268 | * AppIndicator:icon-name: |
109 | 271 | 269 | * | |
110 | 272 | The name of the regular icon that is shown for the indicator. | 270 | * The name of the regular icon that is shown for the indicator. |
111 | 273 | */ | 271 | */ |
112 | 274 | g_object_class_install_property(object_class, | 272 | g_object_class_install_property(object_class, |
113 | 275 | PROP_ICON_NAME, | 273 | PROP_ICON_NAME, |
114 | 276 | g_param_spec_string (PROP_ICON_NAME_S, | 274 | g_param_spec_string (PROP_ICON_NAME_S, |
115 | @@ -279,10 +277,10 @@ | |||
116 | 279 | NULL, | 277 | NULL, |
117 | 280 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | 278 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); |
118 | 281 | /** | 279 | /** |
123 | 282 | AppIndicator:icon-desc: | 280 | * AppIndicator:icon-desc: |
124 | 283 | 281 | * | |
125 | 284 | The description of the regular icon that is shown for the indicator. | 282 | * The description of the regular icon that is shown for the indicator. |
126 | 285 | */ | 283 | */ |
127 | 286 | g_object_class_install_property(object_class, | 284 | g_object_class_install_property(object_class, |
128 | 287 | PROP_ICON_DESC, | 285 | PROP_ICON_DESC, |
129 | 288 | g_param_spec_string (PROP_ICON_DESC_S, | 286 | g_param_spec_string (PROP_ICON_DESC_S, |
130 | @@ -292,11 +290,11 @@ | |||
131 | 292 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | 290 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); |
132 | 293 | 291 | ||
133 | 294 | /** | 292 | /** |
139 | 295 | AppIndicator:attention-icon-name: | 293 | * AppIndicator:attention-icon-name: |
140 | 296 | 294 | * | |
141 | 297 | If the indicator sets it's status to %APP_INDICATOR_STATUS_ATTENTION | 295 | * If the indicator sets it's status to %APP_INDICATOR_STATUS_ATTENTION |
142 | 298 | then this icon is shown. | 296 | * then this icon is shown. |
143 | 299 | */ | 297 | */ |
144 | 300 | g_object_class_install_property (object_class, | 298 | g_object_class_install_property (object_class, |
145 | 301 | PROP_ATTENTION_ICON_NAME, | 299 | PROP_ATTENTION_ICON_NAME, |
146 | 302 | g_param_spec_string (PROP_ATTENTION_ICON_NAME_S, | 300 | g_param_spec_string (PROP_ATTENTION_ICON_NAME_S, |
147 | @@ -305,11 +303,11 @@ | |||
148 | 305 | NULL, | 303 | NULL, |
149 | 306 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | 304 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); |
150 | 307 | /** | 305 | /** |
156 | 308 | AppIndicator:attention-icon-desc: | 306 | * AppIndicator:attention-icon-desc: |
157 | 309 | 307 | * | |
158 | 310 | If the indicator sets it's status to %APP_INDICATOR_STATUS_ATTENTION | 308 | * If the indicator sets it's status to %APP_INDICATOR_STATUS_ATTENTION |
159 | 311 | then this textual description of the icon shown. | 309 | * then this textual description of the icon shown. |
160 | 312 | */ | 310 | */ |
161 | 313 | g_object_class_install_property (object_class, | 311 | g_object_class_install_property (object_class, |
162 | 314 | PROP_ATTENTION_ICON_DESC, | 312 | PROP_ATTENTION_ICON_DESC, |
163 | 315 | g_param_spec_string (PROP_ATTENTION_ICON_DESC_S, | 313 | g_param_spec_string (PROP_ATTENTION_ICON_DESC_S, |
164 | @@ -318,11 +316,11 @@ | |||
165 | 318 | NULL, | 316 | NULL, |
166 | 319 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | 317 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); |
167 | 320 | /** | 318 | /** |
173 | 321 | AppIndicator:icon-theme-path: | 319 | * AppIndicator:icon-theme-path: |
174 | 322 | 320 | * | |
175 | 323 | An additional place to look for icon names that may be installed by the | 321 | * An additional place to look for icon names that may be installed by the |
176 | 324 | application. | 322 | * application. |
177 | 325 | */ | 323 | */ |
178 | 326 | g_object_class_install_property(object_class, | 324 | g_object_class_install_property(object_class, |
179 | 327 | PROP_ICON_THEME_PATH, | 325 | PROP_ICON_THEME_PATH, |
180 | 328 | g_param_spec_string (PROP_ICON_THEME_PATH_S, | 326 | g_param_spec_string (PROP_ICON_THEME_PATH_S, |
181 | @@ -332,11 +330,11 @@ | |||
182 | 332 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT)); | 330 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_CONSTRUCT)); |
183 | 333 | 331 | ||
184 | 334 | /** | 332 | /** |
190 | 335 | AppIndicator:connected: | 333 | * AppIndicator:connected: |
191 | 336 | 334 | * | |
192 | 337 | Pretty simple, %TRUE if we have a reasonable expectation of being | 335 | * Pretty simple, %TRUE if we have a reasonable expectation of being |
193 | 338 | displayed through this object. You should hide your TrayIcon if so. | 336 | * displayed through this object. You should hide your TrayIcon if so. |
194 | 339 | */ | 337 | */ |
195 | 340 | g_object_class_install_property (object_class, | 338 | g_object_class_install_property (object_class, |
196 | 341 | PROP_CONNECTED, | 339 | PROP_CONNECTED, |
197 | 342 | g_param_spec_boolean (PROP_CONNECTED_S, | 340 | g_param_spec_boolean (PROP_CONNECTED_S, |
198 | @@ -345,15 +343,15 @@ | |||
199 | 345 | FALSE, | 343 | FALSE, |
200 | 346 | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); | 344 | G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); |
201 | 347 | /** | 345 | /** |
211 | 348 | AppIndicator:label: | 346 | * AppIndicator:label: |
212 | 349 | 347 | * | |
213 | 350 | A label that can be shown next to the string in the application | 348 | * A label that can be shown next to the string in the application |
214 | 351 | indicator. The label will not be shown unless there is an icon | 349 | * indicator. The label will not be shown unless there is an icon |
215 | 352 | as well. The label is useful for numerical and other frequently | 350 | * as well. The label is useful for numerical and other frequently |
216 | 353 | updated information. In general, it shouldn't be shown unless a | 351 | * updated information. In general, it shouldn't be shown unless a |
217 | 354 | user requests it as it can take up a significant amount of space | 352 | * user requests it as it can take up a significant amount of space |
218 | 355 | on the user's panel. This may not be shown in all visualizations. | 353 | * on the user's panel. This may not be shown in all visualizations. |
219 | 356 | */ | 354 | */ |
220 | 357 | g_object_class_install_property(object_class, | 355 | g_object_class_install_property(object_class, |
221 | 358 | PROP_LABEL, | 356 | PROP_LABEL, |
222 | 359 | g_param_spec_string (PROP_LABEL_S, | 357 | g_param_spec_string (PROP_LABEL_S, |
223 | @@ -362,16 +360,16 @@ | |||
224 | 362 | NULL, | 360 | NULL, |
225 | 363 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | 361 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); |
226 | 364 | /** | 362 | /** |
237 | 365 | AppIndicator:label-guide: | 363 | * AppIndicator:label-guide: |
238 | 366 | 364 | * | |
239 | 367 | An optional string to provide guidance to the panel on how big | 365 | * An optional string to provide guidance to the panel on how big |
240 | 368 | the #AppIndicator:label string could get. If this is set correctly | 366 | * the #AppIndicator:label string could get. If this is set correctly |
241 | 369 | then the panel should never 'jiggle' as the string adjusts through | 367 | * then the panel should never 'jiggle' as the string adjusts through |
242 | 370 | out the range of options. For instance, if you were providing a | 368 | * out the range of options. For instance, if you were providing a |
243 | 371 | percentage like "54% thrust" in #AppIndicator:label you'd want to | 369 | * percentage like "54% thrust" in #AppIndicator:label you'd want to |
244 | 372 | set this string to "100% thrust" to ensure space when Scotty can | 370 | * set this string to "100% thrust" to ensure space when Scotty can |
245 | 373 | get you enough power. | 371 | * get you enough power. |
246 | 374 | */ | 372 | */ |
247 | 375 | g_object_class_install_property(object_class, | 373 | g_object_class_install_property(object_class, |
248 | 376 | PROP_LABEL_GUIDE, | 374 | PROP_LABEL_GUIDE, |
249 | 377 | g_param_spec_string (PROP_LABEL_GUIDE_S, | 375 | g_param_spec_string (PROP_LABEL_GUIDE_S, |
250 | @@ -380,17 +378,17 @@ | |||
251 | 380 | NULL, | 378 | NULL, |
252 | 381 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | 379 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); |
253 | 382 | /** | 380 | /** |
265 | 383 | AppIndicator:ordering-index: | 381 | * AppIndicator:ordering-index: |
266 | 384 | 382 | * | |
267 | 385 | The ordering index is an odd parameter, and if you think you don't need | 383 | * The ordering index is an odd parameter, and if you think you don't need |
268 | 386 | it you're probably right. In general, the application indicator try | 384 | * it you're probably right. In general, the application indicator try |
269 | 387 | to place the applications in a recreatable place taking into account | 385 | * to place the applications in a recreatable place taking into account |
270 | 388 | which category they're in to try and group them. But, there are some | 386 | * which category they're in to try and group them. But, there are some |
271 | 389 | cases where you'd want to ensure indicators are next to each other. | 387 | * cases where you'd want to ensure indicators are next to each other. |
272 | 390 | To do that you can override the generated ordering index and replace it | 388 | * To do that you can override the generated ordering index and replace it |
273 | 391 | with a new one. Again, you probably don't want to be doing this, but | 389 | * with a new one. Again, you probably don't want to be doing this, but |
274 | 392 | in case you do, this is the way. | 390 | * in case you do, this is the way. |
275 | 393 | */ | 391 | */ |
276 | 394 | g_object_class_install_property(object_class, | 392 | g_object_class_install_property(object_class, |
277 | 395 | PROP_ORDERING_INDEX, | 393 | PROP_ORDERING_INDEX, |
278 | 396 | g_param_spec_uint (PROP_ORDERING_INDEX_S, | 394 | g_param_spec_uint (PROP_ORDERING_INDEX_S, |
279 | @@ -400,11 +398,11 @@ | |||
280 | 400 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); | 398 | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); |
281 | 401 | 399 | ||
282 | 402 | /** | 400 | /** |
288 | 403 | AppIndicator:dbus-menu-server: | 401 | * AppIndicator:dbus-menu-server: |
289 | 404 | 402 | * | |
290 | 405 | A way to get the internal dbusmenu server if it is available. | 403 | * A way to get the internal dbusmenu server if it is available. |
291 | 406 | This should only be used for testing. | 404 | * This should only be used for testing. |
292 | 407 | */ | 405 | */ |
293 | 408 | g_object_class_install_property(object_class, | 406 | g_object_class_install_property(object_class, |
294 | 409 | PROP_DBUS_MENU_SERVER, | 407 | PROP_DBUS_MENU_SERVER, |
295 | 410 | g_param_spec_object (PROP_DBUS_MENU_SERVER_S, | 408 | g_param_spec_object (PROP_DBUS_MENU_SERVER_S, |
296 | @@ -416,11 +414,11 @@ | |||
297 | 416 | /* Signals */ | 414 | /* Signals */ |
298 | 417 | 415 | ||
299 | 418 | /** | 416 | /** |
305 | 419 | AppIndicator::new-icon: | 417 | * AppIndicator::new-icon: |
306 | 420 | @arg0: The #AppIndicator object | 418 | * @arg0: The #AppIndicator object |
307 | 421 | 419 | * | |
308 | 422 | Emitted when #AppIndicator:icon-name is changed | 420 | * when #AppIndicator:icon-name is changed |
309 | 423 | */ | 421 | */ |
310 | 424 | signals[NEW_ICON] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ICON, | 422 | signals[NEW_ICON] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ICON, |
311 | 425 | G_TYPE_FROM_CLASS(klass), | 423 | G_TYPE_FROM_CLASS(klass), |
312 | 426 | G_SIGNAL_RUN_LAST, | 424 | G_SIGNAL_RUN_LAST, |
313 | @@ -430,11 +428,11 @@ | |||
314 | 430 | G_TYPE_NONE, 0, G_TYPE_NONE); | 428 | G_TYPE_NONE, 0, G_TYPE_NONE); |
315 | 431 | 429 | ||
316 | 432 | /** | 430 | /** |
322 | 433 | AppIndicator::new-attention-icon: | 431 | * AppIndicator::new-attention-icon: |
323 | 434 | @arg0: The #AppIndicator object | 432 | * @arg0: The #AppIndicator object |
324 | 435 | 433 | * | |
325 | 436 | Emitted when #AppIndicator:attention-icon-name is changed | 434 | * Emitted when #AppIndicator:attention-icon-name is changed |
326 | 437 | */ | 435 | */ |
327 | 438 | signals[NEW_ATTENTION_ICON] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON, | 436 | signals[NEW_ATTENTION_ICON] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON, |
328 | 439 | G_TYPE_FROM_CLASS(klass), | 437 | G_TYPE_FROM_CLASS(klass), |
329 | 440 | G_SIGNAL_RUN_LAST, | 438 | G_SIGNAL_RUN_LAST, |
330 | @@ -444,12 +442,12 @@ | |||
331 | 444 | G_TYPE_NONE, 0, G_TYPE_NONE); | 442 | G_TYPE_NONE, 0, G_TYPE_NONE); |
332 | 445 | 443 | ||
333 | 446 | /** | 444 | /** |
340 | 447 | AppIndicator::new-status: | 445 | * AppIndicator::new-status: |
341 | 448 | @arg0: The #AppIndicator object | 446 | * @arg0: The #AppIndicator object |
342 | 449 | @arg1: The string value of the #AppIndicatorStatus enum. | 447 | * @arg1: The string value of the #AppIndicatorStatus enum. |
343 | 450 | 448 | * | |
344 | 451 | Emitted when #AppIndicator:status is changed | 449 | * Emitted when #AppIndicator:status is changed |
345 | 452 | */ | 450 | */ |
346 | 453 | signals[NEW_STATUS] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_STATUS, | 451 | signals[NEW_STATUS] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_STATUS, |
347 | 454 | G_TYPE_FROM_CLASS(klass), | 452 | G_TYPE_FROM_CLASS(klass), |
348 | 455 | G_SIGNAL_RUN_LAST, | 453 | G_SIGNAL_RUN_LAST, |
349 | @@ -460,13 +458,13 @@ | |||
350 | 460 | G_TYPE_STRING); | 458 | G_TYPE_STRING); |
351 | 461 | 459 | ||
352 | 462 | /** | 460 | /** |
360 | 463 | AppIndicator::new-label: | 461 | * AppIndicator::new-label: |
361 | 464 | @arg0: The #AppIndicator object | 462 | * @arg0: The #AppIndicator object |
362 | 465 | @arg1: The string for the label | 463 | * @arg1: The string for the label |
363 | 466 | @arg1: The string for the guide | 464 | * @arg1: The string for the guide |
364 | 467 | 465 | * | |
365 | 468 | Emitted when either #AppIndicator:label or #AppIndicator:label-guide are | 466 | * Emitted when either #AppIndicator:label or #AppIndicator:label-guide are |
366 | 469 | changed. | 467 | * changed. |
367 | 470 | */ | 468 | */ |
368 | 471 | signals[NEW_LABEL] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_LABEL, | 469 | signals[NEW_LABEL] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_LABEL, |
369 | 472 | G_TYPE_FROM_CLASS(klass), | 470 | G_TYPE_FROM_CLASS(klass), |
370 | @@ -477,12 +475,12 @@ | |||
371 | 477 | G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); | 475 | G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); |
372 | 478 | 476 | ||
373 | 479 | /** | 477 | /** |
380 | 480 | AppIndicator::connection-changed: | 478 | * AppIndicator::connection-changed: |
381 | 481 | @arg0: The #AppIndicator object | 479 | * @arg0: The #AppIndicator object |
382 | 482 | @arg1: Whether we're connected or not | 480 | * @arg1: Whether we're connected or not |
383 | 483 | 481 | * | |
384 | 484 | Signaled when we connect to a watcher, or when it drops away. | 482 | * Signaled when we connect to a watcher, or when it drops away. |
385 | 485 | */ | 483 | */ |
386 | 486 | signals[CONNECTION_CHANGED] = g_signal_new (APP_INDICATOR_SIGNAL_CONNECTION_CHANGED, | 484 | signals[CONNECTION_CHANGED] = g_signal_new (APP_INDICATOR_SIGNAL_CONNECTION_CHANGED, |
387 | 487 | G_TYPE_FROM_CLASS(klass), | 485 | G_TYPE_FROM_CLASS(klass), |
388 | 488 | G_SIGNAL_RUN_LAST, | 486 | G_SIGNAL_RUN_LAST, |
389 | @@ -492,12 +490,12 @@ | |||
390 | 492 | G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE); | 490 | G_TYPE_NONE, 1, G_TYPE_BOOLEAN, G_TYPE_NONE); |
391 | 493 | 491 | ||
392 | 494 | /** | 492 | /** |
399 | 495 | AppIndicator::new-icon-theme-path: | 493 | * AppIndicator::new-icon-theme-path: |
400 | 496 | @arg0: The #AppIndicator object | 494 | * @arg0: The #AppIndicator object |
401 | 497 | 495 | * | |
402 | 498 | Signaled when there is a new icon set for the | 496 | * Signaled when there is a new icon set for the |
403 | 499 | object. | 497 | * object. |
404 | 500 | */ | 498 | */ |
405 | 501 | signals[NEW_ICON_THEME_PATH] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH, | 499 | signals[NEW_ICON_THEME_PATH] = g_signal_new (APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH, |
406 | 502 | G_TYPE_FROM_CLASS(klass), | 500 | G_TYPE_FROM_CLASS(klass), |
407 | 503 | G_SIGNAL_RUN_LAST, | 501 | G_SIGNAL_RUN_LAST, |
408 | @@ -507,13 +505,13 @@ | |||
409 | 507 | G_TYPE_NONE, 1, G_TYPE_STRING); | 505 | G_TYPE_NONE, 1, G_TYPE_STRING); |
410 | 508 | 506 | ||
411 | 509 | /** | 507 | /** |
419 | 510 | AppIndicator::scroll-event: | 508 | * AppIndicator::scroll-event: |
420 | 511 | @arg0: The #AppIndicator object | 509 | * @arg0: The #AppIndicator object |
421 | 512 | @arg1: How many steps the scroll wheel has taken | 510 | * @arg1: How many steps the scroll wheel has taken |
422 | 513 | @arg2: (type Gdk.ScrollDirection) Which direction the wheel went in | 511 | * @arg2: (type Gdk.ScrollDirection) Which direction the wheel went in |
423 | 514 | 512 | * | |
424 | 515 | Signaled when the #AppIndicator receives a scroll event. | 513 | * Signaled when the #AppIndicator receives a scroll event. |
425 | 516 | */ | 514 | */ |
426 | 517 | signals[SCROLL_EVENT] = g_signal_new (APP_INDICATOR_SIGNAL_SCROLL_EVENT, | 515 | signals[SCROLL_EVENT] = g_signal_new (APP_INDICATOR_SIGNAL_SCROLL_EVENT, |
427 | 518 | G_TYPE_FROM_CLASS(klass), | 516 | G_TYPE_FROM_CLASS(klass), |
428 | 519 | G_SIGNAL_RUN_LAST, | 517 | G_SIGNAL_RUN_LAST, |
429 | @@ -1646,17 +1644,16 @@ | |||
430 | 1646 | /* ************************* */ | 1644 | /* ************************* */ |
431 | 1647 | 1645 | ||
432 | 1648 | /** | 1646 | /** |
444 | 1649 | app_indicator_new: | 1647 | * app_indicator_new: |
445 | 1650 | @id: The unique id of the indicator to create. | 1648 | * @id: The unique id of the indicator to create. |
446 | 1651 | @icon_name: The icon name for this indicator | 1649 | * @icon_name: The icon name for this indicator |
447 | 1652 | @category: The category of indicator. | 1650 | * @category: The category of indicator. |
448 | 1653 | 1651 | * | |
449 | 1654 | Creates a new #AppIndicator setting the properties: | 1652 | * Creates a new #AppIndicator setting the properties: |
450 | 1655 | #AppIndicator:id with @id, #AppIndicator:category | 1653 | * #AppIndicator:id with @id, #AppIndicator:category with @category |
451 | 1656 | with @category and #AppIndicator:icon-name with | 1654 | * and #AppIndicator:icon-name with @icon_name. |
452 | 1657 | @icon_name. | 1655 | * |
453 | 1658 | 1656 | * Return value: A pointer to a new #AppIndicator object. | |
443 | 1659 | Return value: A pointer to a new #AppIndicator object. | ||
454 | 1660 | */ | 1657 | */ |
455 | 1661 | AppIndicator * | 1658 | AppIndicator * |
456 | 1662 | app_indicator_new (const gchar *id, | 1659 | app_indicator_new (const gchar *id, |
457 | @@ -1673,18 +1670,18 @@ | |||
458 | 1673 | } | 1670 | } |
459 | 1674 | 1671 | ||
460 | 1675 | /** | 1672 | /** |
473 | 1676 | app_indicator_new_with_path: | 1673 | * app_indicator_new_with_path: |
474 | 1677 | @id: The unique id of the indicator to create. | 1674 | * @id: The unique id of the indicator to create. |
475 | 1678 | @icon_name: The icon name for this indicator | 1675 | * @icon_name: The icon name for this indicator |
476 | 1679 | @category: The category of indicator. | 1676 | * @category: The category of indicator. |
477 | 1680 | @icon_theme_path: A custom path for finding icons. | 1677 | * @icon_theme_path: A custom path for finding icons. |
478 | 1681 | 1678 | ||
479 | 1682 | Creates a new #AppIndicator setting the properties: | 1679 | * Creates a new #AppIndicator setting the properties: |
480 | 1683 | #AppIndicator:id with @id, #AppIndicator:category | 1680 | * #AppIndicator:id with @id, #AppIndicator:category with @category, |
481 | 1684 | with @category, #AppIndicator:icon-name with | 1681 | * #AppIndicator:icon-name with @icon_name and #AppIndicator:icon-theme-path |
482 | 1685 | @icon_name and #AppIndicator:icon-theme-path with @icon_theme_path. | 1682 | * with @icon_theme_path. |
483 | 1686 | 1683 | * | |
484 | 1687 | Return value: A pointer to a new #AppIndicator object. | 1684 | * Return value: A pointer to a new #AppIndicator object. |
485 | 1688 | */ | 1685 | */ |
486 | 1689 | AppIndicator * | 1686 | AppIndicator * |
487 | 1690 | app_indicator_new_with_path (const gchar *id, | 1687 | app_indicator_new_with_path (const gchar *id, |
488 | @@ -1703,20 +1700,20 @@ | |||
489 | 1703 | } | 1700 | } |
490 | 1704 | 1701 | ||
491 | 1705 | /** | 1702 | /** |
498 | 1706 | app_indicator_get_type: | 1703 | * app_indicator_get_type: |
499 | 1707 | 1704 | * | |
500 | 1708 | Generates or returns the unique #GType for #AppIndicator. | 1705 | * Generates or returns the unique #GType for #AppIndicator. |
501 | 1709 | 1706 | * | |
502 | 1710 | Return value: A unique #GType for #AppIndicator objects. | 1707 | * Return value: A unique #GType for #AppIndicator objects. |
503 | 1711 | */ | 1708 | */ |
504 | 1712 | 1709 | ||
505 | 1713 | /** | 1710 | /** |
512 | 1714 | app_indicator_set_status: | 1711 | * app_indicator_set_status: |
513 | 1715 | @self: The #AppIndicator object to use | 1712 | * @self: The #AppIndicator object to use |
514 | 1716 | @status: The status to set for this indicator | 1713 | * @status: The status to set for this indicator |
515 | 1717 | 1714 | * | |
516 | 1718 | Wrapper function for property #AppIndicator:status. | 1715 | * Wrapper function for property #AppIndicator:status. |
517 | 1719 | */ | 1716 | */ |
518 | 1720 | void | 1717 | void |
519 | 1721 | app_indicator_set_status (AppIndicator *self, AppIndicatorStatus status) | 1718 | app_indicator_set_status (AppIndicator *self, AppIndicatorStatus status) |
520 | 1722 | { | 1719 | { |
521 | @@ -1750,15 +1747,15 @@ | |||
522 | 1750 | } | 1747 | } |
523 | 1751 | 1748 | ||
524 | 1752 | /** | 1749 | /** |
534 | 1753 | app_indicator_set_attention_icon: | 1750 | * app_indicator_set_attention_icon: |
535 | 1754 | @self: The #AppIndicator object to use | 1751 | * @self: The #AppIndicator object to use |
536 | 1755 | @icon_name: The name of the attention icon to set for this indicator | 1752 | * @icon_name: The name of the attention icon to set for this indicator |
537 | 1756 | 1753 | * | |
538 | 1757 | Wrapper for app_indicator_set_attention_icon_full() with a NULL | 1754 | * Wrapper for app_indicator_set_attention_icon_full() with a NULL |
539 | 1758 | description. | 1755 | * description. |
540 | 1759 | 1756 | * | |
541 | 1760 | Deprecated: Use app_indicator_set_attention_icon_full() instead. | 1757 | * Deprecated: Use app_indicator_set_attention_icon_full() instead. |
542 | 1761 | */ | 1758 | */ |
543 | 1762 | void | 1759 | void |
544 | 1763 | app_indicator_set_attention_icon (AppIndicator *self, const gchar *icon_name) | 1760 | app_indicator_set_attention_icon (AppIndicator *self, const gchar *icon_name) |
545 | 1764 | { | 1761 | { |
546 | @@ -1766,13 +1763,13 @@ | |||
547 | 1766 | } | 1763 | } |
548 | 1767 | 1764 | ||
549 | 1768 | /** | 1765 | /** |
557 | 1769 | app_indicator_set_attention_icon_full: | 1766 | * app_indicator_set_attention_icon_full: |
558 | 1770 | @self: The #AppIndicator object to use | 1767 | * @self: The #AppIndicator object to use |
559 | 1771 | @icon_name: The name of the attention icon to set for this indicator | 1768 | * @icon_name: The name of the attention icon to set for this indicator |
560 | 1772 | @icon_desc: A textual description of the icon | 1769 | * @icon_desc: A textual description of the icon |
561 | 1773 | 1770 | * | |
562 | 1774 | Wrapper function for property #AppIndicator:attention-icon-name. | 1771 | * Wrapper function for property #AppIndicator:attention-icon-name. |
563 | 1775 | */ | 1772 | */ |
564 | 1776 | void | 1773 | void |
565 | 1777 | app_indicator_set_attention_icon_full (AppIndicator *self, const gchar *icon_name, const gchar * icon_desc) | 1774 | app_indicator_set_attention_icon_full (AppIndicator *self, const gchar *icon_name, const gchar * icon_desc) |
566 | 1778 | { | 1775 | { |
567 | @@ -1823,15 +1820,15 @@ | |||
568 | 1823 | } | 1820 | } |
569 | 1824 | 1821 | ||
570 | 1825 | /** | 1822 | /** |
580 | 1826 | app_indicator_set_icon: | 1823 | * app_indicator_set_icon: |
581 | 1827 | @self: The #AppIndicator object to use | 1824 | * @self: The #AppIndicator object to use |
582 | 1828 | @icon_name: The icon name to set. | 1825 | * @icon_name: The icon name to set. |
583 | 1829 | 1826 | * | |
584 | 1830 | Wrapper function for app_indicator_set_icon_full() with a NULL | 1827 | * Wrapper function for app_indicator_set_icon_full() with a NULL |
585 | 1831 | description. | 1828 | * description. |
586 | 1832 | 1829 | * | |
587 | 1833 | Deprecated: Use app_indicator_set_icon_full() | 1830 | * Deprecated: Use app_indicator_set_icon_full() |
588 | 1834 | **/ | 1831 | */ |
589 | 1835 | void | 1832 | void |
590 | 1836 | app_indicator_set_icon (AppIndicator *self, const gchar *icon_name) | 1833 | app_indicator_set_icon (AppIndicator *self, const gchar *icon_name) |
591 | 1837 | { | 1834 | { |
592 | @@ -1839,18 +1836,18 @@ | |||
593 | 1839 | } | 1836 | } |
594 | 1840 | 1837 | ||
595 | 1841 | /** | 1838 | /** |
608 | 1842 | app_indicator_set_icon_full: | 1839 | * app_indicator_set_icon_full: |
609 | 1843 | @self: The #AppIndicator object to use | 1840 | * @self: The #AppIndicator object to use |
610 | 1844 | @icon_name: The icon name to set. | 1841 | * @icon_name: The icon name to set. |
611 | 1845 | @icon_desc: A textual description of the icon for accessibility | 1842 | * @icon_desc: A textual description of the icon for accessibility |
612 | 1846 | 1843 | * | |
613 | 1847 | Sets the default icon to use when the status is active but | 1844 | * Sets the default icon to use when the status is active but |
614 | 1848 | not set to attention. In most cases, this should be the | 1845 | * not set to attention. In most cases, this should be the |
615 | 1849 | application icon for the program. | 1846 | * application icon for the program. |
616 | 1850 | 1847 | * | |
617 | 1851 | Wrapper function for property #AppIndicator:icon-name and | 1848 | * Wrapper function for property #AppIndicator:icon-name and |
618 | 1852 | #AppIndicator::icon-desc. | 1849 | * #AppIndicator::icon-desc. |
619 | 1853 | **/ | 1850 | */ |
620 | 1854 | void | 1851 | void |
621 | 1855 | app_indicator_set_icon_full (AppIndicator *self, const gchar *icon_name, const gchar * icon_desc) | 1852 | app_indicator_set_icon_full (AppIndicator *self, const gchar *icon_name, const gchar * icon_desc) |
622 | 1856 | { | 1853 | { |
623 | @@ -1901,14 +1898,14 @@ | |||
624 | 1901 | } | 1898 | } |
625 | 1902 | 1899 | ||
626 | 1903 | /** | 1900 | /** |
635 | 1904 | app_indicator_set_label: | 1901 | * app_indicator_set_label: |
636 | 1905 | @self: The #AppIndicator object to use | 1902 | * @self: The #AppIndicator object to use |
637 | 1906 | @label: The label to show next to the icon. | 1903 | * @label: The label to show next to the icon. |
638 | 1907 | @guide: A guide to size the label correctly. | 1904 | * @guide: A guide to size the label correctly. |
639 | 1908 | 1905 | * | |
640 | 1909 | This is a wrapper function for the #AppIndicator:label and | 1906 | * This is a wrapper function for the #AppIndicator:label and |
641 | 1910 | #AppIndicator:guide properties. This function can take #NULL | 1907 | * #AppIndicator:guide properties. This function can take #NULL |
642 | 1911 | as either @label or @guide and will clear the entries. | 1908 | * as either @label or @guide and will clear the entries. |
643 | 1912 | */ | 1909 | */ |
644 | 1913 | void | 1910 | void |
645 | 1914 | app_indicator_set_label (AppIndicator *self, const gchar * label, const gchar * guide) | 1911 | app_indicator_set_label (AppIndicator *self, const gchar * label, const gchar * guide) |
646 | @@ -1926,12 +1923,12 @@ | |||
647 | 1926 | } | 1923 | } |
648 | 1927 | 1924 | ||
649 | 1928 | /** | 1925 | /** |
656 | 1929 | app_indicator_set_icon_theme_path: | 1926 | * app_indicator_set_icon_theme_path: |
657 | 1930 | @self: The #AppIndicator object to use | 1927 | * @self: The #AppIndicator object to use |
658 | 1931 | @icon_theme_path: The icon theme path to set. | 1928 | * @icon_theme_path: The icon theme path to set. |
659 | 1932 | 1929 | * | |
660 | 1933 | Sets the path to use when searching for icons. | 1930 | * Sets the path to use when searching for icons. |
661 | 1934 | **/ | 1931 | */ |
662 | 1935 | void | 1932 | void |
663 | 1936 | app_indicator_set_icon_theme_path (AppIndicator *self, const gchar *icon_theme_path) | 1933 | app_indicator_set_icon_theme_path (AppIndicator *self, const gchar *icon_theme_path) |
664 | 1937 | { | 1934 | { |
665 | @@ -1997,17 +1994,17 @@ | |||
666 | 1997 | return; | 1994 | return; |
667 | 1998 | } | 1995 | } |
668 | 1999 | 1996 | ||
680 | 2000 | /** | 1997 | /* |
681 | 2001 | app_indicator_set_menu: | 1998 | * app_indicator_set_menu: |
682 | 2002 | @self: The #AppIndicator | 1999 | * @self: The #AppIndicator |
683 | 2003 | @menu: A #GtkMenu to set | 2000 | * @menu: (allow-none): A #GtkMenu to set |
684 | 2004 | 2001 | * | |
685 | 2005 | Sets the menu that should be shown when the Application Indicator | 2002 | * Sets the menu that should be shown when the Application Indicator |
686 | 2006 | is clicked on in the panel. An application indicator will not | 2003 | * is clicked on in the panel. An application indicator will not |
687 | 2007 | be rendered unless it has a menu. | 2004 | * be rendered unless it has a menu. |
688 | 2008 | 2005 | * | |
689 | 2009 | Wrapper function for property #AppIndicator:menu. | 2006 | * Wrapper function for property #AppIndicator:menu. |
690 | 2010 | **/ | 2007 | */ |
691 | 2011 | void | 2008 | void |
692 | 2012 | app_indicator_set_menu (AppIndicator *self, GtkMenu *menu) | 2009 | app_indicator_set_menu (AppIndicator *self, GtkMenu *menu) |
693 | 2013 | { | 2010 | { |
694 | @@ -2037,16 +2034,16 @@ | |||
695 | 2037 | } | 2034 | } |
696 | 2038 | 2035 | ||
697 | 2039 | /** | 2036 | /** |
708 | 2040 | app_indicator_set_ordering_index: | 2037 | * app_indicator_set_ordering_index: |
709 | 2041 | @self: The #AppIndicator | 2038 | * @self: The #AppIndicator |
710 | 2042 | @ordering_index: A value for the ordering of this app indicator | 2039 | * @ordering_index: A value for the ordering of this app indicator |
711 | 2043 | 2040 | * | |
712 | 2044 | Sets the ordering index for the app indicator which effects the | 2041 | * Sets the ordering index for the app indicator which effects the |
713 | 2045 | placement of it on the panel. For almost all app indicator | 2042 | * placement of it on the panel. For almost all app indicator |
714 | 2046 | this is not the function you're looking for. | 2043 | * this is not the function you're looking for. |
715 | 2047 | 2044 | * | |
716 | 2048 | Wrapper function for property #AppIndicator:ordering-index. | 2045 | * Wrapper function for property #AppIndicator:ordering-index. |
717 | 2049 | **/ | 2046 | */ |
718 | 2050 | void | 2047 | void |
719 | 2051 | app_indicator_set_ordering_index (AppIndicator *self, guint32 ordering_index) | 2048 | app_indicator_set_ordering_index (AppIndicator *self, guint32 ordering_index) |
720 | 2052 | { | 2049 | { |
721 | @@ -2058,19 +2055,19 @@ | |||
722 | 2058 | } | 2055 | } |
723 | 2059 | 2056 | ||
724 | 2060 | /** | 2057 | /** |
738 | 2061 | app_indicator_set_secondary_activate_target: | 2058 | * app_indicator_set_secondary_activate_target: |
739 | 2062 | @self: The #AppIndicator | 2059 | * @self: The #AppIndicator |
740 | 2063 | @menuitem: A #GtkWidget to be activated on secondary activation | 2060 | * @menuitem: (allow-none): A #GtkWidget to be activated on secondary activation |
741 | 2064 | 2061 | * | |
742 | 2065 | Set the @menuitem to be activated when a secondary activation event (i.e. a | 2062 | * Set the @menuitem to be activated when a secondary activation event (i.e. a |
743 | 2066 | middle-click) is emitted over the #AppIndicator icon/label. | 2063 | * middle-click) is emitted over the #AppIndicator icon/label. |
744 | 2067 | 2064 | * | |
745 | 2068 | The @menuitem can be also a complex #GtkWidget, but to get activated when | 2065 | * The @menuitem can be also a complex #GtkWidget, but to get activated when |
746 | 2069 | a secondary activation occurs in the #Appindicator, it must be a visible and | 2066 | * a secondary activation occurs in the #Appindicator, it must be a visible and |
747 | 2070 | active child (or inner-child) of the #AppIndicator:menu. | 2067 | * active child (or inner-child) of the #AppIndicator:menu. |
748 | 2071 | 2068 | * | |
749 | 2072 | Setting @menuitem to %NULL causes to disable this feature. | 2069 | * Setting @menuitem to %NULL causes to disable this feature. |
750 | 2073 | **/ | 2070 | */ |
751 | 2074 | void | 2071 | void |
752 | 2075 | app_indicator_set_secondary_activate_target (AppIndicator *self, GtkWidget *menuitem) | 2072 | app_indicator_set_secondary_activate_target (AppIndicator *self, GtkWidget *menuitem) |
753 | 2076 | { | 2073 | { |
754 | @@ -2097,13 +2094,13 @@ | |||
755 | 2097 | } | 2094 | } |
756 | 2098 | 2095 | ||
757 | 2099 | /** | 2096 | /** |
765 | 2100 | app_indicator_get_id: | 2097 | * app_indicator_get_id: |
766 | 2101 | @self: The #AppIndicator object to use | 2098 | * @self: The #AppIndicator object to use |
767 | 2102 | 2099 | * | |
768 | 2103 | Wrapper function for property #AppIndicator:id. | 2100 | * Wrapper function for property #AppIndicator:id. |
769 | 2104 | 2101 | * | |
770 | 2105 | Return value: The current ID | 2102 | * Return value: The current ID |
771 | 2106 | */ | 2103 | */ |
772 | 2107 | const gchar * | 2104 | const gchar * |
773 | 2108 | app_indicator_get_id (AppIndicator *self) | 2105 | app_indicator_get_id (AppIndicator *self) |
774 | 2109 | { | 2106 | { |
775 | @@ -2113,13 +2110,13 @@ | |||
776 | 2113 | } | 2110 | } |
777 | 2114 | 2111 | ||
778 | 2115 | /** | 2112 | /** |
786 | 2116 | app_indicator_get_category: | 2113 | * app_indicator_get_category: |
787 | 2117 | @self: The #AppIndicator object to use | 2114 | * @self: The #AppIndicator object to use |
788 | 2118 | 2115 | * | |
789 | 2119 | Wrapper function for property #AppIndicator:category. | 2116 | * Wrapper function for property #AppIndicator:category. |
790 | 2120 | 2117 | * | |
791 | 2121 | Return value: The current category. | 2118 | * Return value: The current category. |
792 | 2122 | */ | 2119 | */ |
793 | 2123 | AppIndicatorCategory | 2120 | AppIndicatorCategory |
794 | 2124 | app_indicator_get_category (AppIndicator *self) | 2121 | app_indicator_get_category (AppIndicator *self) |
795 | 2125 | { | 2122 | { |
796 | @@ -2129,13 +2126,13 @@ | |||
797 | 2129 | } | 2126 | } |
798 | 2130 | 2127 | ||
799 | 2131 | /** | 2128 | /** |
807 | 2132 | app_indicator_get_status: | 2129 | * app_indicator_get_status: |
808 | 2133 | @self: The #AppIndicator object to use | 2130 | * @self: The #AppIndicator object to use |
809 | 2134 | 2131 | * | |
810 | 2135 | Wrapper function for property #AppIndicator:status. | 2132 | * Wrapper function for property #AppIndicator:status. |
811 | 2136 | 2133 | * | |
812 | 2137 | Return value: The current status. | 2134 | * Return value: The current status. |
813 | 2138 | */ | 2135 | */ |
814 | 2139 | AppIndicatorStatus | 2136 | AppIndicatorStatus |
815 | 2140 | app_indicator_get_status (AppIndicator *self) | 2137 | app_indicator_get_status (AppIndicator *self) |
816 | 2141 | { | 2138 | { |
817 | @@ -2145,13 +2142,13 @@ | |||
818 | 2145 | } | 2142 | } |
819 | 2146 | 2143 | ||
820 | 2147 | /** | 2144 | /** |
828 | 2148 | app_indicator_get_icon: | 2145 | * app_indicator_get_icon: |
829 | 2149 | @self: The #AppIndicator object to use | 2146 | * @self: The #AppIndicator object to use |
830 | 2150 | 2147 | * | |
831 | 2151 | Wrapper function for property #AppIndicator:icon-name. | 2148 | * Wrapper function for property #AppIndicator:icon-name. |
832 | 2152 | 2149 | * | |
833 | 2153 | Return value: The current icon name. | 2150 | * Return value: The current icon name. |
834 | 2154 | */ | 2151 | */ |
835 | 2155 | const gchar * | 2152 | const gchar * |
836 | 2156 | app_indicator_get_icon (AppIndicator *self) | 2153 | app_indicator_get_icon (AppIndicator *self) |
837 | 2157 | { | 2154 | { |
838 | @@ -2161,12 +2158,12 @@ | |||
839 | 2161 | } | 2158 | } |
840 | 2162 | 2159 | ||
841 | 2163 | /** | 2160 | /** |
848 | 2164 | app_indicator_get_icon_desc: | 2161 | * app_indicator_get_icon_desc: |
849 | 2165 | @self: The #AppIndicator object to use | 2162 | * @self: The #AppIndicator object to use |
850 | 2166 | 2163 | * | |
851 | 2167 | Wrapper function for property #AppIndicator:icon-desc. | 2164 | * Wrapper function for property #AppIndicator:icon-desc. |
852 | 2168 | 2165 | * | |
853 | 2169 | Return value: The current icon description. | 2166 | * Return value: The current icon description. |
854 | 2170 | */ | 2167 | */ |
855 | 2171 | const gchar * | 2168 | const gchar * |
856 | 2172 | app_indicator_get_icon_desc (AppIndicator *self) | 2169 | app_indicator_get_icon_desc (AppIndicator *self) |
857 | @@ -2177,13 +2174,13 @@ | |||
858 | 2177 | } | 2174 | } |
859 | 2178 | 2175 | ||
860 | 2179 | /** | 2176 | /** |
868 | 2180 | app_indicator_get_icon_theme_path: | 2177 | * app_indicator_get_icon_theme_path: |
869 | 2181 | @self: The #AppIndicator object to use | 2178 | * @self: The #AppIndicator object to use |
870 | 2182 | 2179 | * | |
871 | 2183 | Wrapper function for property #AppIndicator:icon-theme-path. | 2180 | * Wrapper function for property #AppIndicator:icon-theme-path. |
872 | 2184 | 2181 | * | |
873 | 2185 | Return value: The current icon theme path. | 2182 | * Return value: The current icon theme path. |
874 | 2186 | */ | 2183 | */ |
875 | 2187 | const gchar * | 2184 | const gchar * |
876 | 2188 | app_indicator_get_icon_theme_path (AppIndicator *self) | 2185 | app_indicator_get_icon_theme_path (AppIndicator *self) |
877 | 2189 | { | 2186 | { |
878 | @@ -2193,13 +2190,13 @@ | |||
879 | 2193 | } | 2190 | } |
880 | 2194 | 2191 | ||
881 | 2195 | /** | 2192 | /** |
889 | 2196 | app_indicator_get_attention_icon: | 2193 | * app_indicator_get_attention_icon: |
890 | 2197 | @self: The #AppIndicator object to use | 2194 | * @self: The #AppIndicator object to use |
891 | 2198 | 2195 | * | |
892 | 2199 | Wrapper function for property #AppIndicator:attention-icon-name. | 2196 | * Wrapper function for property #AppIndicator:attention-icon-name. |
893 | 2200 | 2197 | * | |
894 | 2201 | Return value: The current attention icon name. | 2198 | * Return value: The current attention icon name. |
895 | 2202 | */ | 2199 | */ |
896 | 2203 | const gchar * | 2200 | const gchar * |
897 | 2204 | app_indicator_get_attention_icon (AppIndicator *self) | 2201 | app_indicator_get_attention_icon (AppIndicator *self) |
898 | 2205 | { | 2202 | { |
899 | @@ -2209,13 +2206,13 @@ | |||
900 | 2209 | } | 2206 | } |
901 | 2210 | 2207 | ||
902 | 2211 | /** | 2208 | /** |
910 | 2212 | app_indicator_get_attention_icon_desc: | 2209 | * app_indicator_get_attention_icon_desc: |
911 | 2213 | @self: The #AppIndicator object to use | 2210 | * @self: The #AppIndicator object to use |
912 | 2214 | 2211 | * | |
913 | 2215 | Wrapper function for property #AppIndicator:attention-icon-desc. | 2212 | * Wrapper function for property #AppIndicator:attention-icon-desc. |
914 | 2216 | 2213 | * | |
915 | 2217 | Return value: The current attention icon description. | 2214 | * Return value: The current attention icon description. |
916 | 2218 | */ | 2215 | */ |
917 | 2219 | const gchar * | 2216 | const gchar * |
918 | 2220 | app_indicator_get_attention_icon_desc (AppIndicator *self) | 2217 | app_indicator_get_attention_icon_desc (AppIndicator *self) |
919 | 2221 | { | 2218 | { |
920 | @@ -2225,14 +2222,14 @@ | |||
921 | 2225 | } | 2222 | } |
922 | 2226 | 2223 | ||
923 | 2227 | /** | 2224 | /** |
932 | 2228 | app_indicator_get_menu: | 2225 | * app_indicator_get_menu: |
933 | 2229 | @self: The #AppIndicator object to use | 2226 | * @self: The #AppIndicator object to use |
934 | 2230 | 2227 | * | |
935 | 2231 | Gets the menu being used for this application indicator. | 2228 | * Gets the menu being used for this application indicator. |
936 | 2232 | Wrapper function for property #AppIndicator:menu. | 2229 | * Wrapper function for property #AppIndicator:menu. |
937 | 2233 | 2230 | * | |
938 | 2234 | Return value: (transfer full): A #GtkMenu object or %NULL if one hasn't been set. | 2231 | * Returns: (transfer full): A #GtkMenu object or %NULL if one hasn't been set. |
939 | 2235 | */ | 2232 | */ |
940 | 2236 | GtkMenu * | 2233 | GtkMenu * |
941 | 2237 | app_indicator_get_menu (AppIndicator *self) | 2234 | app_indicator_get_menu (AppIndicator *self) |
942 | 2238 | { | 2235 | { |
943 | @@ -2246,13 +2243,13 @@ | |||
944 | 2246 | } | 2243 | } |
945 | 2247 | 2244 | ||
946 | 2248 | /** | 2245 | /** |
954 | 2249 | app_indicator_get_label: | 2246 | * app_indicator_get_label: |
955 | 2250 | @self: The #AppIndicator object to use | 2247 | * @self: The #AppIndicator object to use |
956 | 2251 | 2248 | * | |
957 | 2252 | Wrapper function for property #AppIndicator:label. | 2249 | * Wrapper function for property #AppIndicator:label. |
958 | 2253 | 2250 | * | |
959 | 2254 | Return value: The current label. | 2251 | * Return value: The current label. |
960 | 2255 | */ | 2252 | */ |
961 | 2256 | const gchar * | 2253 | const gchar * |
962 | 2257 | app_indicator_get_label (AppIndicator *self) | 2254 | app_indicator_get_label (AppIndicator *self) |
963 | 2258 | { | 2255 | { |
964 | @@ -2262,13 +2259,13 @@ | |||
965 | 2262 | } | 2259 | } |
966 | 2263 | 2260 | ||
967 | 2264 | /** | 2261 | /** |
975 | 2265 | app_indicator_get_label_guide: | 2262 | * app_indicator_get_label_guide: |
976 | 2266 | @self: The #AppIndicator object to use | 2263 | * @self: The #AppIndicator object to use |
977 | 2267 | 2264 | * | |
978 | 2268 | Wrapper function for property #AppIndicator:label-guide. | 2265 | * Wrapper function for property #AppIndicator:label-guide. |
979 | 2269 | 2266 | * | |
980 | 2270 | Return value: The current label guide. | 2267 | * Return value: The current label guide. |
981 | 2271 | */ | 2268 | */ |
982 | 2272 | const gchar * | 2269 | const gchar * |
983 | 2273 | app_indicator_get_label_guide (AppIndicator *self) | 2270 | app_indicator_get_label_guide (AppIndicator *self) |
984 | 2274 | { | 2271 | { |
985 | @@ -2278,13 +2275,13 @@ | |||
986 | 2278 | } | 2275 | } |
987 | 2279 | 2276 | ||
988 | 2280 | /** | 2277 | /** |
996 | 2281 | app_indicator_get_ordering_index: | 2278 | * app_indicator_get_ordering_index: |
997 | 2282 | @self: The #AppIndicator object to use | 2279 | * @self: The #AppIndicator object to use |
998 | 2283 | 2280 | * | |
999 | 2284 | Wrapper function for property #AppIndicator:ordering-index. | 2281 | * Wrapper function for property #AppIndicator:ordering-index. |
1000 | 2285 | 2282 | * | |
1001 | 2286 | Return value: The current ordering index. | 2283 | * Return value: The current ordering index. |
1002 | 2287 | */ | 2284 | */ |
1003 | 2288 | guint32 | 2285 | guint32 |
1004 | 2289 | app_indicator_get_ordering_index (AppIndicator *self) | 2286 | app_indicator_get_ordering_index (AppIndicator *self) |
1005 | 2290 | { | 2287 | { |
1006 | @@ -2298,13 +2295,13 @@ | |||
1007 | 2298 | } | 2295 | } |
1008 | 2299 | 2296 | ||
1009 | 2300 | /** | 2297 | /** |
1017 | 2301 | app_indicator_get_secondary_activate_target: | 2298 | * app_indicator_get_secondary_activate_target: |
1018 | 2302 | @self: The #AppIndicator object to use | 2299 | * @self: The #AppIndicator object to use |
1019 | 2303 | 2300 | * | |
1020 | 2304 | Gets the menuitem being called on secondary-activate event. | 2301 | * Gets the menuitem being called on secondary-activate event. |
1021 | 2305 | 2302 | * | |
1022 | 2306 | Return value: (transfer full): A #GtkWidget object or %NULL if none has been set. | 2303 | * Returns: (transfer full): A #GtkWidget object or %NULL if none has been set. |
1023 | 2307 | */ | 2304 | */ |
1024 | 2308 | GtkWidget * | 2305 | GtkWidget * |
1025 | 2309 | app_indicator_get_secondary_activate_target (AppIndicator *self) | 2306 | app_indicator_get_secondary_activate_target (AppIndicator *self) |
1026 | 2310 | { | 2307 | { |
1027 | @@ -2335,14 +2332,14 @@ | |||
1028 | 2335 | } | 2332 | } |
1029 | 2336 | 2333 | ||
1030 | 2337 | /** | 2334 | /** |
1039 | 2338 | app_indicator_build_menu_from_desktop: | 2335 | * app_indicator_build_menu_from_desktop: |
1040 | 2339 | @self: The #AppIndicator object to use | 2336 | * @self: The #AppIndicator object to use |
1041 | 2340 | @desktop_file: A path to the desktop file to build the menu from | 2337 | * @desktop_file: A path to the desktop file to build the menu from |
1042 | 2341 | @desktop_profile: Which entries should be used from the desktop file | 2338 | * @desktop_profile: Which entries should be used from the desktop file |
1043 | 2342 | 2339 | * | |
1044 | 2343 | This function allows for building the Application Indicator menu | 2340 | * This function allows for building the Application Indicator menu |
1045 | 2344 | from a static desktop file. | 2341 | * from a static desktop file. |
1046 | 2345 | */ | 2342 | */ |
1047 | 2346 | void | 2343 | void |
1048 | 2347 | app_indicator_build_menu_from_desktop (AppIndicator * self, const gchar * desktop_file, const gchar * desktop_profile) | 2344 | app_indicator_build_menu_from_desktop (AppIndicator * self, const gchar * desktop_file, const gchar * desktop_profile) |
1049 | 2348 | { | 2345 | { |
1050 | 2349 | 2346 | ||
1051 | === modified file 'src/app-indicator.h' | |||
1052 | --- src/app-indicator.h 2011-07-20 15:29:24 +0000 | |||
1053 | +++ src/app-indicator.h 2011-07-20 15:29:24 +0000 | |||
1054 | @@ -35,40 +35,40 @@ | |||
1055 | 35 | G_BEGIN_DECLS | 35 | G_BEGIN_DECLS |
1056 | 36 | 36 | ||
1057 | 37 | /** | 37 | /** |
1092 | 38 | APP_INDICATOR_TYPE: | 38 | * APP_INDICATOR_TYPE: |
1093 | 39 | 39 | * | |
1094 | 40 | Get the #GType for a #AppIndicator. | 40 | * Get the #GType for a #AppIndicator. |
1095 | 41 | */ | 41 | */ |
1096 | 42 | /** | 42 | /** |
1097 | 43 | APP_INDICATOR: | 43 | * APP_INDICATOR: |
1098 | 44 | @obj: The object to convert | 44 | * @obj: The object to convert |
1099 | 45 | 45 | * | |
1100 | 46 | Safely convert a #GObject into an #AppIndicator. | 46 | * Safely convert a #GObject into an #AppIndicator. |
1101 | 47 | */ | 47 | */ |
1102 | 48 | /** | 48 | /** |
1103 | 49 | APP_INDICATOR_CLASS: | 49 | * APP_INDICATOR_CLASS: |
1104 | 50 | @klass: #GObjectClass based class to convert. | 50 | * @klass: #GObjectClass based class to convert. |
1105 | 51 | 51 | * | |
1106 | 52 | Safely convert a #GObjectClass into a #AppIndicatorClass. | 52 | * Safely convert a #GObjectClass into a #AppIndicatorClass. |
1107 | 53 | */ | 53 | */ |
1108 | 54 | /** | 54 | /** |
1109 | 55 | IS_APP_INDICATOR: | 55 | * IS_APP_INDICATOR: |
1110 | 56 | @obj: An #GObject to check | 56 | * @obj: An #GObject to check |
1111 | 57 | 57 | * | |
1112 | 58 | Checks to see if @obj is in the object hierarchy of #AppIndicator. | 58 | * Checks to see if @obj is in the object hierarchy of #AppIndicator. |
1113 | 59 | */ | 59 | */ |
1114 | 60 | /** | 60 | /** |
1115 | 61 | IS_APP_INDICATOR_CLASS: | 61 | * IS_APP_INDICATOR_CLASS: |
1116 | 62 | @klass: An #GObjectClass to check | 62 | * @klass: An #GObjectClass to check |
1117 | 63 | 63 | * | |
1118 | 64 | Checks to see if @klass is in the object class hierarchy of #AppIndicatorClass. | 64 | * Checks to see if @klass is in the object class hierarchy of #AppIndicatorClass. |
1119 | 65 | */ | 65 | */ |
1120 | 66 | /** | 66 | /** |
1121 | 67 | APP_INDICATOR_GET_CLASS: | 67 | * APP_INDICATOR_GET_CLASS: |
1122 | 68 | @obj: A #GObject in the class hierarchy of #AppIndicator. | 68 | * @obj: A #GObject in the class hierarchy of #AppIndicator. |
1123 | 69 | 69 | * | |
1124 | 70 | Gets a pointer to the #AppIndicatorClass for the object @obj. | 70 | * Gets a pointer to the #AppIndicatorClass for the object @obj. |
1125 | 71 | */ | 71 | */ |
1126 | 72 | 72 | ||
1127 | 73 | #define APP_INDICATOR_TYPE (app_indicator_get_type ()) | 73 | #define APP_INDICATOR_TYPE (app_indicator_get_type ()) |
1128 | 74 | #define APP_INDICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), APP_INDICATOR_TYPE, AppIndicator)) | 74 | #define APP_INDICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), APP_INDICATOR_TYPE, AppIndicator)) |
1129 | @@ -78,40 +78,40 @@ | |||
1130 | 78 | #define APP_INDICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), APP_INDICATOR_TYPE, AppIndicatorClass)) | 78 | #define APP_INDICATOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), APP_INDICATOR_TYPE, AppIndicatorClass)) |
1131 | 79 | 79 | ||
1132 | 80 | /** | 80 | /** |
1167 | 81 | APP_INDICATOR_SIGNAL_NEW_ICON: | 81 | * APP_INDICATOR_SIGNAL_NEW_ICON: |
1168 | 82 | 82 | * | |
1169 | 83 | String identifier for the #AppIndicator::new-icon signal. | 83 | * String identifier for the #AppIndicator::new-icon signal. |
1170 | 84 | */ | 84 | */ |
1171 | 85 | /** | 85 | /** |
1172 | 86 | APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON: | 86 | * APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON: |
1173 | 87 | 87 | * | |
1174 | 88 | String identifier for the #AppIndicator::new-attention-icon signal. | 88 | * String identifier for the #AppIndicator::new-attention-icon signal. |
1175 | 89 | */ | 89 | */ |
1176 | 90 | /** | 90 | /** |
1177 | 91 | APP_INDICATOR_SIGNAL_NEW_STATUS: | 91 | * APP_INDICATOR_SIGNAL_NEW_STATUS: |
1178 | 92 | 92 | * | |
1179 | 93 | String identifier for the #AppIndicator::new-status signal. | 93 | * String identifier for the #AppIndicator::new-status signal. |
1180 | 94 | */ | 94 | */ |
1181 | 95 | /** | 95 | /** |
1182 | 96 | APP_INDICATOR_SIGNAL_NEW_LABEL: | 96 | * APP_INDICATOR_SIGNAL_NEW_LABEL: |
1183 | 97 | 97 | * | |
1184 | 98 | String identifier for the #AppIndicator::new-label signal. | 98 | * String identifier for the #AppIndicator::new-label signal. |
1185 | 99 | */ | 99 | */ |
1186 | 100 | /** | 100 | /** |
1187 | 101 | APP_INDICATOR_SIGNAL_CONNECTION_CHANGED: | 101 | * APP_INDICATOR_SIGNAL_CONNECTION_CHANGED: |
1188 | 102 | 102 | * | |
1189 | 103 | String identifier for the #AppIndicator::connection-changed signal. | 103 | * String identifier for the #AppIndicator::connection-changed signal. |
1190 | 104 | */ | 104 | */ |
1191 | 105 | /** | 105 | /** |
1192 | 106 | APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH: | 106 | * APP_INDICATOR_SIGNAL_NEW_ICON_THEME_PATH: |
1193 | 107 | 107 | * | |
1194 | 108 | String identifier for the #AppIndicator::new-icon-theme-path signal. | 108 | * String identifier for the #AppIndicator::new-icon-theme-path signal. |
1195 | 109 | */ | 109 | */ |
1196 | 110 | /** | 110 | /** |
1197 | 111 | APP_INDICATOR_SIGNAL_SCROLL_EVENT: | 111 | * APP_INDICATOR_SIGNAL_SCROLL_EVENT: |
1198 | 112 | 112 | * | |
1199 | 113 | String identifier for the #AppIndicator::scroll-event signal. | 113 | * String identifier for the #AppIndicator::scroll-event signal. |
1200 | 114 | */ | 114 | */ |
1201 | 115 | #define APP_INDICATOR_SIGNAL_NEW_ICON "new-icon" | 115 | #define APP_INDICATOR_SIGNAL_NEW_ICON "new-icon" |
1202 | 116 | #define APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON "new-attention-icon" | 116 | #define APP_INDICATOR_SIGNAL_NEW_ATTENTION_ICON "new-attention-icon" |
1203 | 117 | #define APP_INDICATOR_SIGNAL_NEW_STATUS "new-status" | 117 | #define APP_INDICATOR_SIGNAL_NEW_STATUS "new-status" |
1204 | @@ -121,16 +121,16 @@ | |||
1205 | 121 | #define APP_INDICATOR_SIGNAL_SCROLL_EVENT "scroll-event" | 121 | #define APP_INDICATOR_SIGNAL_SCROLL_EVENT "scroll-event" |
1206 | 122 | 122 | ||
1207 | 123 | /** | 123 | /** |
1218 | 124 | AppIndicatorCategory: | 124 | * AppIndicatorCategory: |
1219 | 125 | @APP_INDICATOR_CATEGORY_APPLICATION_STATUS: The indicator is used to display the status of the application. | 125 | * @APP_INDICATOR_CATEGORY_APPLICATION_STATUS: The indicator is used to display the status of the application. |
1220 | 126 | @APP_INDICATOR_CATEGORY_COMMUNICATIONS: The application is used for communication with other people. | 126 | * @APP_INDICATOR_CATEGORY_COMMUNICATIONS: The application is used for communication with other people. |
1221 | 127 | @APP_INDICATOR_CATEGORY_SYSTEM_SERVICES: A system indicator relating to something in the user's system. | 127 | * @APP_INDICATOR_CATEGORY_SYSTEM_SERVICES: A system indicator relating to something in the user's system. |
1222 | 128 | @APP_INDICATOR_CATEGORY_HARDWARE: An indicator relating to the user's hardware. | 128 | * @APP_INDICATOR_CATEGORY_HARDWARE: An indicator relating to the user's hardware. |
1223 | 129 | @APP_INDICATOR_CATEGORY_OTHER: Something not defined in this enum, please don't use unless you really need it. | 129 | * @APP_INDICATOR_CATEGORY_OTHER: Something not defined in this enum, please don't use unless you really need it. |
1224 | 130 | 130 | * | |
1225 | 131 | The category provides grouping for the indicators so that | 131 | * The category provides grouping for the indicators so that |
1226 | 132 | users can find indicators that are similar together. | 132 | * users can find indicators that are similar together. |
1227 | 133 | */ | 133 | */ |
1228 | 134 | typedef enum { /*< prefix=APP_INDICATOR_CATEGORY >*/ | 134 | typedef enum { /*< prefix=APP_INDICATOR_CATEGORY >*/ |
1229 | 135 | APP_INDICATOR_CATEGORY_APPLICATION_STATUS, /*< nick=ApplicationStatus >*/ | 135 | APP_INDICATOR_CATEGORY_APPLICATION_STATUS, /*< nick=ApplicationStatus >*/ |
1230 | 136 | APP_INDICATOR_CATEGORY_COMMUNICATIONS, /*< nick=Communications >*/ | 136 | APP_INDICATOR_CATEGORY_COMMUNICATIONS, /*< nick=Communications >*/ |
1231 | @@ -140,16 +140,16 @@ | |||
1232 | 140 | } AppIndicatorCategory; | 140 | } AppIndicatorCategory; |
1233 | 141 | 141 | ||
1234 | 142 | /** | 142 | /** |
1245 | 143 | AppIndicatorStatus: | 143 | * AppIndicatorStatus: |
1246 | 144 | @APP_INDICATOR_STATUS_PASSIVE: The indicator should not be shown to the user. | 144 | * @APP_INDICATOR_STATUS_PASSIVE: The indicator should not be shown to the user. |
1247 | 145 | @APP_INDICATOR_STATUS_ACTIVE: The indicator should be shown in it's default state. | 145 | * @APP_INDICATOR_STATUS_ACTIVE: The indicator should be shown in it's default state. |
1248 | 146 | @APP_INDICATOR_STATUS_ATTENTION: The indicator should show it's attention icon. | 146 | * @APP_INDICATOR_STATUS_ATTENTION: The indicator should show it's attention icon. |
1249 | 147 | 147 | * | |
1250 | 148 | These are the states that the indicator can be on in | 148 | * These are the states that the indicator can be on in |
1251 | 149 | the user's panel. The indicator by default starts | 149 | * the user's panel. The indicator by default starts |
1252 | 150 | in the state @APP_INDICATOR_STATUS_PASSIVE and can be | 150 | * in the state @APP_INDICATOR_STATUS_PASSIVE and can be |
1253 | 151 | shown by setting it to @APP_INDICATOR_STATUS_ACTIVE. | 151 | * shown by setting it to @APP_INDICATOR_STATUS_ACTIVE. |
1254 | 152 | */ | 152 | */ |
1255 | 153 | typedef enum { /*< prefix=APP_INDICATOR_STATUS >*/ | 153 | typedef enum { /*< prefix=APP_INDICATOR_STATUS >*/ |
1256 | 154 | APP_INDICATOR_STATUS_PASSIVE, /*< nick=Passive >*/ | 154 | APP_INDICATOR_STATUS_PASSIVE, /*< nick=Passive >*/ |
1257 | 155 | APP_INDICATOR_STATUS_ACTIVE, /*< nick=Active >*/ | 155 | APP_INDICATOR_STATUS_ACTIVE, /*< nick=Active >*/ |
1258 | @@ -161,30 +161,30 @@ | |||
1259 | 161 | typedef struct _AppIndicatorPrivate AppIndicatorPrivate; | 161 | typedef struct _AppIndicatorPrivate AppIndicatorPrivate; |
1260 | 162 | 162 | ||
1261 | 163 | /** | 163 | /** |
1286 | 164 | AppIndicatorClass: | 164 | * AppIndicatorClass: |
1287 | 165 | @parent_class: Mia familia | 165 | * @parent_class: Mia familia |
1288 | 166 | @new_icon: Slot for #AppIndicator::new-icon. | 166 | * @new_icon: Slot for #AppIndicator::new-icon. |
1289 | 167 | @new_attention_icon: Slot for #AppIndicator::new-attention-icon. | 167 | * @new_attention_icon: Slot for #AppIndicator::new-attention-icon. |
1290 | 168 | @new_status: Slot for #AppIndicator::new-status. | 168 | * @new_status: Slot for #AppIndicator::new-status. |
1291 | 169 | @new_icon_theme_path: Slot for #AppIndicator::new-icon-theme-path | 169 | * @new_icon_theme_path: Slot for #AppIndicator::new-icon-theme-path |
1292 | 170 | @new_label: Slot for #AppIndicator::new-label. | 170 | * @new_label: Slot for #AppIndicator::new-label. |
1293 | 171 | @connection_changed: Slot for #AppIndicator::connection-changed. | 171 | * @connection_changed: Slot for #AppIndicator::connection-changed. |
1294 | 172 | @scroll_event: Slot for #AppIndicator::scroll-event | 172 | * @scroll_event: Slot for #AppIndicator::scroll-event |
1295 | 173 | @app_indicator_reserved_ats: Reserved for future use. | 173 | * @app_indicator_reserved_ats: Reserved for future use. |
1296 | 174 | @fallback: Function that gets called to make a #GtkStatusIcon when | 174 | * @fallback: Function that gets called to make a #GtkStatusIcon when |
1297 | 175 | there is no Application Indicator area available. | 175 | * there is no Application Indicator area available. |
1298 | 176 | @unfallback: The function that gets called if an Application | 176 | * @unfallback: The function that gets called if an Application |
1299 | 177 | Indicator area appears after the fallback has been created. | 177 | * Indicator area appears after the fallback has been created. |
1300 | 178 | @app_indicator_reserved_1: Reserved for future use. | 178 | * @app_indicator_reserved_1: Reserved for future use. |
1301 | 179 | @app_indicator_reserved_2: Reserved for future use. | 179 | * @app_indicator_reserved_2: Reserved for future use. |
1302 | 180 | @app_indicator_reserved_3: Reserved for future use. | 180 | * @app_indicator_reserved_3: Reserved for future use. |
1303 | 181 | @app_indicator_reserved_4: Reserved for future use. | 181 | * @app_indicator_reserved_4: Reserved for future use. |
1304 | 182 | @app_indicator_reserved_5: Reserved for future use. | 182 | * @app_indicator_reserved_5: Reserved for future use. |
1305 | 183 | @app_indicator_reserved_6: Reserved for future use. | 183 | * @app_indicator_reserved_6: Reserved for future use. |
1306 | 184 | 184 | * | |
1307 | 185 | The signals and external functions that make up the #AppIndicator | 185 | * The signals and external functions that make up the #AppIndicator |
1308 | 186 | class object. | 186 | * class object. |
1309 | 187 | */ | 187 | */ |
1310 | 188 | struct _AppIndicatorClass { | 188 | struct _AppIndicatorClass { |
1311 | 189 | /* Parent */ | 189 | /* Parent */ |
1312 | 190 | GObjectClass parent_class; | 190 | GObjectClass parent_class; |
1313 | @@ -232,19 +232,18 @@ | |||
1314 | 232 | }; | 232 | }; |
1315 | 233 | 233 | ||
1316 | 234 | /** | 234 | /** |
1328 | 235 | AppIndicator: | 235 | * AppIndicator: |
1329 | 236 | 236 | * | |
1330 | 237 | A application indicator represents the values that are needed to show a | 237 | * A application indicator represents the values that are needed to show a |
1331 | 238 | unique status in the panel for an application. In general, applications | 238 | * unique status in the panel for an application. In general, applications |
1332 | 239 | should try to fit in the other indicators that are available on the | 239 | * should try to fit in the other indicators that are available on the |
1333 | 240 | panel before using this. But, sometimes it is necissary. | 240 | * panel before using this. But, sometimes it is necissary. |
1334 | 241 | */ | 241 | * |
1335 | 242 | /* Private fields | 242 | * Private fields |
1336 | 243 | @parent: Parent object. | 243 | * @parent: Parent object. |
1337 | 244 | @priv: Internal data. | 244 | * @priv: Internal data. |
1338 | 245 | */ | 245 | */ |
1339 | 246 | struct _AppIndicator { | 246 | struct _AppIndicator { |
1340 | 247 | /*< Private >*/ | ||
1341 | 248 | GObject parent; | 247 | GObject parent; |
1342 | 249 | 248 | ||
1343 | 250 | /*< Private >*/ | 249 | /*< Private >*/ |
1344 | @@ -296,6 +295,7 @@ | |||
1345 | 296 | const gchar * app_indicator_get_icon_theme_path (AppIndicator *self); | 295 | const gchar * app_indicator_get_icon_theme_path (AppIndicator *self); |
1346 | 297 | const gchar * app_indicator_get_attention_icon (AppIndicator *self); | 296 | const gchar * app_indicator_get_attention_icon (AppIndicator *self); |
1347 | 298 | const gchar * app_indicator_get_attention_icon_desc (AppIndicator *self); | 297 | const gchar * app_indicator_get_attention_icon_desc (AppIndicator *self); |
1348 | 298 | |||
1349 | 299 | GtkMenu * app_indicator_get_menu (AppIndicator *self); | 299 | GtkMenu * app_indicator_get_menu (AppIndicator *self); |
1350 | 300 | const gchar * app_indicator_get_label (AppIndicator *self); | 300 | const gchar * app_indicator_get_label (AppIndicator *self); |
1351 | 301 | const gchar * app_indicator_get_label_guide (AppIndicator *self); | 301 | const gchar * app_indicator_get_label_guide (AppIndicator *self); |
1352 | @@ -310,20 +310,20 @@ | |||
1353 | 310 | G_END_DECLS | 310 | G_END_DECLS |
1354 | 311 | 311 | ||
1355 | 312 | /** | 312 | /** |
1371 | 313 | SECTION:app-indicator | 313 | * SECTION:app-indicator |
1372 | 314 | @short_description: An object to put application information | 314 | * @short_description: An object to put application information |
1373 | 315 | into the panel. | 315 | * into the panel. |
1374 | 316 | @stability: Unstable | 316 | * @stability: Unstable |
1375 | 317 | @include: libappindicator/app-indicator.h | 317 | * @include: libappindicator/app-indicator.h |
1376 | 318 | 318 | * | |
1377 | 319 | An application indicator is a way for an application to put | 319 | * An application indicator is a way for an application to put |
1378 | 320 | a menu into the panel on the user's screen. This allows the | 320 | * a menu into the panel on the user's screen. This allows the |
1379 | 321 | user to interact with the application even though it might | 321 | * user to interact with the application even though it might |
1380 | 322 | not be visible to the user at the time. In most cases this | 322 | * not be visible to the user at the time. In most cases this |
1381 | 323 | is not a good solution as there are other ways to inform the | 323 | * is not a good solution as there are other ways to inform the |
1382 | 324 | user. It should only be use if persistence is a desired | 324 | * user. It should only be use if persistence is a desired |
1383 | 325 | feature for the user (not for your marketing purpose of | 325 | * feature for the user (not for your marketing purpose of |
1384 | 326 | having your logo in the panel). | 326 | * having your logo in the panel). |
1385 | 327 | */ | 327 | */ |
1386 | 328 | 328 | ||
1387 | 329 | #endif | 329 | #endif |
Sucks that g-ir-scanner can only use that format as I like the other one better :-) Thanks for converting everything!