diff options
| author | Ted Gould <ted@gould.cx> | 2012-04-04 14:34:11 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-04-04 14:34:11 -0500 |
| commit | c136bda24416af489864fa8e1302a7aca259ba3a (patch) | |
| tree | 3ffece57d67ce9e9c266715b071c7af4f01d8678 /libindicator | |
| parent | 4ecaca4861ec00e19936e9655de38c118bdc9a62 (diff) | |
| parent | f75080c55cd666e48f1a7c9c8bcf62e77cfb7f3b (diff) | |
| download | libayatana-indicator-c136bda24416af489864fa8e1302a7aca259ba3a.tar.gz libayatana-indicator-c136bda24416af489864fa8e1302a7aca259ba3a.tar.bz2 libayatana-indicator-c136bda24416af489864fa8e1302a7aca259ba3a.zip | |
Import upstream version 0.4.95
Diffstat (limited to 'libindicator')
| -rw-r--r-- | libindicator/indicator-desktop-shortcuts.c | 2 | ||||
| -rw-r--r-- | libindicator/indicator-service-manager.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/libindicator/indicator-desktop-shortcuts.c b/libindicator/indicator-desktop-shortcuts.c index 13c1667..0a4e026 100644 --- a/libindicator/indicator-desktop-shortcuts.c +++ b/libindicator/indicator-desktop-shortcuts.c @@ -199,7 +199,7 @@ set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec /* But fallback if we can't */ if (priv->actions == ACTIONS_NONE && g_key_file_has_key(keyfile, G_KEY_FILE_DESKTOP_GROUP, OLD_SHORTCUTS_KEY, NULL)) { priv->actions = ACTIONS_XAYATANA; - g_warning("Desktop file '%s' is using a depracted format for it's actions that will be dropped soon.", g_value_get_string(value)); + g_warning("Desktop file '%s' is using a deprecated format for its actions that will be dropped soon.", g_value_get_string(value)); } if (priv->actions == ACTIONS_NONE) { diff --git a/libindicator/indicator-service-manager.c b/libindicator/indicator-service-manager.c index 33b0557..f58c148 100644 --- a/libindicator/indicator-service-manager.c +++ b/libindicator/indicator-service-manager.c @@ -536,8 +536,8 @@ service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_n { IndicatorServiceManagerPrivate * priv = INDICATOR_SERVICE_MANAGER_GET_PRIVATE(user_data); - gchar * new_name = NULL; - gchar * prev_name = NULL; + const gchar * new_name = NULL; + const gchar * prev_name = NULL; g_variant_get(parameters, "(&s&s&s)", NULL, &prev_name, &new_name); if (new_name == NULL || new_name[0] == 0) { @@ -571,9 +571,6 @@ service_proxy_name_changed (GDBusConnection * connection, const gchar * sender_n } } - g_free (new_name); - g_free (prev_name); - return; } |