[rhythmbox] Remove eggdesktopfile usage
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] Remove eggdesktopfile usage
- Date: Sat, 8 Mar 2014 11:37:40 +0000 (UTC)
commit 7066bd26ffb0672edb82c87c6ad5f249d7ee7cd4
Author: Armin K <krejzi email com>
Date: Sat Mar 8 21:31:54 2014 +1000
Remove eggdesktopfile usage
doc/reference/Makefile.am | 1 -
lib/Makefile.am | 2 -
lib/eggdesktopfile.c | 1519 ---------------------------------------
lib/eggdesktopfile.h | 162 -----
plugins/mpris/rb-mpris-plugin.c | 13 +-
shell/main.c | 11 +-
6 files changed, 9 insertions(+), 1699 deletions(-)
---
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index f762b4a..7f92996 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -33,7 +33,6 @@ CFILE_GLOB=$(top_srcdir)/lib/*.c
# - plugins (no API there)
IGNORE_HFILES= \
config.h \
- eggdesktopfile.h \
eggwrapbox.h \
eggwrapbox-enums.h \
md5.h \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 494be54..eaf5ce6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,8 +18,6 @@ rbinclude_HEADERS = \
librb_la_SOURCES = \
$(rbinclude_HEADERS) \
rb-debug.c \
- eggdesktopfile.c \
- eggdesktopfile.h \
rb-file-helpers.c \
rb-builder-helpers.c \
rb-stock-icons.c \
diff --git a/plugins/mpris/rb-mpris-plugin.c b/plugins/mpris/rb-mpris-plugin.c
index 0d7fb53..300eda3 100644
--- a/plugins/mpris/rb-mpris-plugin.c
+++ b/plugins/mpris/rb-mpris-plugin.c
@@ -38,7 +38,6 @@
#include <lib/rb-util.h>
#include <lib/rb-debug.h>
-#include <lib/eggdesktopfile.h>
#include <plugins/rb-plugin-macros.h>
#include <shell/rb-shell.h>
#include <shell/rb-shell-player.h>
@@ -269,16 +268,16 @@ get_root_property (GDBusConnection *connection,
} else if (g_strcmp0 (property_name, "HasTrackList") == 0) {
return g_variant_new_boolean (FALSE);
} else if (g_strcmp0 (property_name, "Identity") == 0) {
- EggDesktopFile *desktop_file;
- desktop_file = egg_get_desktop_file ();
- return g_variant_new_string (egg_desktop_file_get_name (desktop_file));
+ return g_variant_new_string ("Rhythmbox");
} else if (g_strcmp0 (property_name, "DesktopEntry") == 0) {
- EggDesktopFile *desktop_file;
GVariant *v = NULL;
char *path;
- desktop_file = egg_get_desktop_file ();
- path = g_filename_from_uri (egg_desktop_file_get_source (desktop_file), NULL, error);
+#ifdef USE_UNINSTALLED_DIRS
+ path = g_build_filename (SHARE_UNINSTALLED_BUILDDIR, "rhythmbox.desktop", NULL);
+#else
+ path = g_build_filename (DATADIR, "applications", "rhythmbox.desktop", NULL);
+#endif
if (path != NULL) {
char *basename;
char *ext;
diff --git a/shell/main.c b/shell/main.c
index 7a58f3c..0ae5fec 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -43,7 +43,6 @@
#include "rb-shell.h"
#include "rb-util.h"
-#include "eggdesktopfile.h"
#include "rb-debug.h"
#include "rb-application.h"
@@ -51,7 +50,6 @@ int
main (int argc, char **argv)
{
GApplication *app;
- char *desktop_file_path;
int rc;
#ifdef GDK_WINDOWING_X11
@@ -65,14 +63,8 @@ main (int argc, char **argv)
g_random_set_seed (time (0));
#ifdef USE_UNINSTALLED_DIRS
- desktop_file_path = g_build_filename (SHARE_UNINSTALLED_BUILDDIR, "rhythmbox.desktop", NULL);
-
g_setenv ("GSETTINGS_SCHEMA_DIR", SHARE_UNINSTALLED_BUILDDIR, TRUE);
-#else
- desktop_file_path = g_build_filename (DATADIR, "applications", "rhythmbox.desktop", NULL);
#endif
- egg_set_desktop_file (desktop_file_path);
- g_free (desktop_file_path);
setlocale (LC_ALL, NULL);
@@ -84,6 +76,9 @@ main (int argc, char **argv)
textdomain (GETTEXT_PACKAGE);
#endif
+ g_set_application_name (_("Rhythmbox"));
+ gtk_window_set_default_icon ("rhythmbox");
+
#if defined(USE_UNINSTALLED_DIRS)
g_irepository_prepend_search_path (SHARE_UNINSTALLED_BUILDDIR "/../bindings/gi");
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]