[Merge] lp:~seb128/indicator-messages/newer-libglib-deprecations into lp:indicator-messages

[Iain Lane]

Review: Needs Fixing

Thanks for fixing this. Mostly good, but just one comment about the proper (GLib) way to do those casts, then feel free to land this yourself. :)

Diff comments:

> 
> === modified file 'src/indicator-desktop-shortcuts.c'
> --- src/indicator-desktop-shortcuts.c	2013-08-20 16:31:19 +0000
> +++ src/indicator-desktop-shortcuts.c	2019-09-13 08:14:47 +0000
> @@ -124,7 +119,7 @@
>  static void
>  indicator_desktop_shortcuts_dispose (GObject *object)
>  {
> -	IndicatorDesktopShortcutsPrivate * priv = INDICATOR_DESKTOP_SHORTCUTS_GET_PRIVATE(object);
> +	IndicatorDesktopShortcutsPrivate * priv = indicator_desktop_shortcuts_get_instance_private((IndicatorDesktopShortcuts *)object);

Should be "INDICATOR_DESKTOP_SHORTCUTS(object)" (& similar for the other type) to use G_TYPE_CHECK_INSTANCE_CAST() internally.

Also (this is optional feedback) this line is really long now, might be an idea to split it into two or even four. Untested:

```
IndicatorDesktopShortcuts *shortcuts = INDICATOR_DESKTOP_SHORTCUTS(object);
IndicatorDesktopShortcutsPrivate *priv = indicator_desktop_shortcuts_get_instance_private(shortcuts);
```

or

```
IndicatorDesktopShortcuts *shortcuts;
IndicatorDesktopShortcutsPrivate *priv;

shortcuts = INDICATOR_DESKTOP_SHORTCUTS(object);
priv = indicator_desktop_shortcuts_get_instance_private(shortcuts);
```

>  
>  	if (priv->keyfile) {
>  		g_key_file_free(priv->keyfile);


-- 
https://code.launchpad.net/~seb128/indicator-messages/newer-libglib-deprecations/+merge/372751
Your team Indicator Applet Developers is subscribed to branch lp:indicator-messages.