projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GSettings: fix check for delaying backend subscription
[platform/upstream/glib.git]
/
gio
/
gapplication-tool.c
diff --git
a/gio/gapplication-tool.c
b/gio/gapplication-tool.c
index
c152909
..
9f6f8d1
100644
(file)
--- a/
gio/gapplication-tool.c
+++ b/
gio/gapplication-tool.c
@@
-12,9
+12,7
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
*
* Author: Ryan Lortie <desrt@desrt.ca>
*/
@@
-240,8
+238,12
@@
app_path_for_id (const gchar *app_id)
path = g_strconcat ("/", app_id, NULL);
for (i = 0; path[i]; i++)
path = g_strconcat ("/", app_id, NULL);
for (i = 0; path[i]; i++)
- if (path[i] == '.')
- path[i] = '/';
+ {
+ if (path[i] == '.')
+ path[i] = '/';
+ if (path[i] == '-')
+ path[i] = '_';
+ }
return path;
}
return path;
}
@@
-295,7
+297,7
@@
app_get_platform_data (void)
g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
- if ((startup_id = g_getenv ("DESKTOP_STARTUP_
i
D")))
+ if ((startup_id = g_getenv ("DESKTOP_STARTUP_
I
D")))
g_variant_builder_add (&builder, "{sv}", "desktop-startup-id", g_variant_new_string (startup_id));
return g_variant_builder_end (&builder);
g_variant_builder_add (&builder, "{sv}", "desktop-startup-id", g_variant_new_string (startup_id));
return g_variant_builder_end (&builder);
@@
-336,9
+338,13
@@
app_action (gchar **args)
if (!parameter)
{
if (!parameter)
{
- g_printerr (_("error parsing action parameter: %s\n"), error->message);
+ gchar *context;
+
+ context = g_variant_parse_error_print_context (error, args[2]);
+ g_printerr (_("error parsing action parameter: %s\n"), context);
g_variant_builder_clear (¶ms);
g_error_free (error);
g_variant_builder_clear (¶ms);
g_error_free (error);
+ g_free (context);
return 1;
}
return 1;
}