[Xfce4-commits] <midori:master> Consistently use PACKAGE_NAME instead of literal binary name

[Christian Dywan]

Updating branch refs/heads/master
         to 6fb2666083d96705794bb2578979fe8b35677f67 (commit)
       from e7e101038e12d2f1bf3bec610f2450ffcd4902bd (commit)

commit 6fb2666083d96705794bb2578979fe8b35677f67
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Apr 7 21:34:42 2013 +0200

    Consistently use PACKAGE_NAME instead of literal binary name

 midori/midori-app.c          |    2 +-
 midori/midori-browser.c      |    2 +-
 midori/midori-speeddial.vala |    2 +-
 midori/socket.c              |    4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/midori/midori-app.c b/midori/midori-app.c
index 04f0d71..435f11b 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -794,7 +794,7 @@ midori_app_init (MidoriApp* app)
     app->instance = MidoriAppInstanceNull;
 
     #if HAVE_LIBNOTIFY
-    notify_init ("midori");
+    notify_init (PACKAGE_NAME);
     #else
     app->program_notify_send = g_find_program_in_path ("notify-send");
     #endif
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 367a25f..15be7a1 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2568,7 +2568,7 @@ _action_add_desktop_shortcut_activate (GtkAction*     action,
     g_key_file_set_string (keyfile, "Desktop Entry", "Type", "Application");
     g_key_file_set_string (keyfile, "Desktop Entry", "Name", app_name);
     g_key_file_set_string (keyfile, "Desktop Entry", "Exec", app_exec);
-    g_key_file_set_string (keyfile, "Desktop Entry", "TryExec", "midori");
+    g_key_file_set_string (keyfile, "Desktop Entry", "TryExec", PACKAGE_NAME);
     g_key_file_set_string (keyfile, "Desktop Entry", "Icon", app_icon);
     g_key_file_set_string (keyfile, "Desktop Entry", "Categories", "Network;");
     sokoke_key_file_save_to_file (keyfile, app_dir, NULL);
diff --git a/midori/midori-speeddial.vala b/midori/midori-speeddial.vala
index d8dc29a..ba27997 100644
--- a/midori/midori-speeddial.vala
+++ b/midori/midori-speeddial.vala
@@ -99,7 +99,7 @@ namespace Midori {
                 Katze.mkdir_with_parents (
                     Path.build_path (Path.DIR_SEPARATOR_S,
                                      Environment.get_user_cache_dir (),
-                                     "midori", "thumbnails"), 0700);
+                                     PACKAGE_NAME, "thumbnails"), 0700);
 
                 foreach (string tile in keyfile.get_groups ()) {
                     try {
diff --git a/midori/socket.c b/midori/socket.c
index a4d3c55..cd4c1bf 100644
--- a/midori/socket.c
+++ b/midori/socket.c
@@ -263,8 +263,8 @@ gint socket_init(const gchar *instance_name, const gchar *config_dir, gboolean *
 #else
 	*exists = FALSE;
 	if (socket_filename == NULL)
-		socket_filename = g_strdup_printf("%s%cmidori_socket_%s_%s",
-			config_dir, G_DIR_SEPARATOR, g_get_host_name(), instance_name);
+		socket_filename = g_strdup_printf("%s%c%s_socket_%s_%s",
+			config_dir, G_DIR_SEPARATOR, PACKAGE_NAME, g_get_host_name(), instance_name);
 
 	sock = fd_connect_unix(socket_filename);
 	if (sock < 0)