X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgapplication-tool.c;h=9f6f8d1c933d99adad60ae6c22f3f4be3d573815;hb=d9ad40b4eaf1a9197ab363de4346a8d84f45f5c1;hp=c1529090e12745978feed5fb3700a632212b089a;hpb=9defb6b1b1de18b6005148e036941e89b400dbd2;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gapplication-tool.c b/gio/gapplication-tool.c
index c152909..9f6f8d1 100644
--- 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
- * 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>
  */
@@ -240,8 +238,12 @@ app_path_for_id (const gchar *app_id)
 
   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;
 }
@@ -295,7 +297,7 @@ app_get_platform_data (void)
 
   g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
 
-  if ((startup_id = g_getenv ("DESKTOP_STARTUP_iD")))
+  if ((startup_id = g_getenv ("DESKTOP_STARTUP_ID")))
     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)
         {
-          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 (&params);
           g_error_free (error);
+          g_free (context);
           return 1;
         }