From f4148c3992afe7f6c6ca5e03c87e418e5d1054f8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Wed, 11 May 2016 20:52:33 +0200
Subject: [PATCH] Set prgname instead of program_class

The former always wins for application matching when using the wayland
backend.

https://bugzilla.gnome.org/show_bug.cgi?id=766285
---
 src/empathy-accounts.c    | 2 +-
 src/empathy-auth-client.c | 2 +-
 src/empathy-call.c        | 2 +-
 src/empathy-chat.c        | 2 +-
 src/empathy-debugger.c    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 9788e11d5..f0db55157 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -240,7 +240,7 @@ main (int argc, char *argv[])
   g_set_application_name (_("Empathy Accounts"));
 
   /* Make empathy and empathy-accounts appear as the same app in gnome-shell */
-  gdk_set_program_class ("Empathy");
+  g_set_prgname ("empathy");
   gtk_window_set_default_icon_name ("empathy");
 
   app = gtk_application_new (EMPATHY_ACCOUNTS_BUS_NAME, G_APPLICATION_FLAGS_NONE);
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index be5b13a0b..3ee478d3e 100644
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -302,7 +302,7 @@ main (int argc,
 
   /* Make empathy and empathy-auth-client appear as the same app in
    * gnome-shell */
-  gdk_set_program_class ("Empathy");
+  g_set_prgname ("empathy");
   gtk_window_set_default_icon_name ("empathy");
   textdomain (GETTEXT_PACKAGE);
 
diff --git a/src/empathy-call.c b/src/empathy-call.c
index 3bc148802..8821bf386 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -250,7 +250,7 @@ main (int argc,
   g_set_application_name (_("Empathy Audio/Video Client"));
 
   /* Make empathy and empathy-call appear as the same app in gnome-shell */
-  gdk_set_program_class ("Empathy");
+  g_set_prgname ("empathy");
   gtk_window_set_default_icon_name ("empathy");
 
   gtk_settings = gtk_settings_get_default ();
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index f25acb657..e0bcd813e 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -116,7 +116,7 @@ main (int argc,
   empathy_init ();
 
   /* Make empathy and empathy-chat appear as the same app in gnome-shell */
-  gdk_set_program_class ("Empathy");
+  g_set_prgname ("empathy");
   gtk_window_set_default_icon_name ("empathy");
   textdomain (GETTEXT_PACKAGE);
 
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index 8be2be32c..36819ba8a 100644
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -141,7 +141,7 @@ main (int argc,
   g_set_application_name (_("Empathy Debugger"));
 
   /* Make empathy and empathy-debugger appear as the same app in gnome-shell */
-  gdk_set_program_class ("Empathy");
+  g_set_prgname ("empathy");
   gtk_window_set_default_icon_name ("empathy");
 
   retval = g_application_run (G_APPLICATION (app), argc, argv);
-- 
2.11.4.GIT