[gnome-panel/wip/gnome-3.10+] remove last use of libegg
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/wip/gnome-3.10+] remove last use of libegg
- Date: Mon, 13 Oct 2014 01:48:09 +0000 (UTC)
commit 6f636c4aa69b4d395eb5823bdfd8403976c7cab0
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Oct 12 21:02:09 2014 +0300
remove last use of libegg
gnome-panel/main.c | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/gnome-panel/main.c b/gnome-panel/main.c
index 2d06418..962cff8 100644
--- a/gnome-panel/main.c
+++ b/gnome-panel/main.c
@@ -14,9 +14,6 @@
#include <glib/gi18n.h>
-#include <libegg/eggdesktopfile.h>
-#include <libegg/eggsmclient.h>
-
#include <libpanel-util/panel-cleanup.h>
#include <libpanel-util/panel-glib.h>
@@ -78,7 +75,6 @@ theme_changed (GtkSettings *settings)
int
main (int argc, char **argv)
{
- char *desktopfile;
GOptionContext *context;
GError *error;
GtkSettings *settings;
@@ -89,12 +85,8 @@ main (int argc, char **argv)
textdomain (GETTEXT_PACKAGE);
g_set_prgname ("gnome-panel");
-
- desktopfile = panel_g_lookup_in_applications_dirs ("gnome-panel.desktop");
- if (desktopfile) {
- egg_set_desktop_file (desktopfile);
- g_free (desktopfile);
- }
+ g_set_application_name (_("Panel"));
+ gtk_window_set_default_icon_name (PANEL_ICON_PANEL);
context = g_option_context_new ("");
g_option_context_add_group (context, gtk_get_option_group (TRUE));
@@ -113,11 +105,6 @@ main (int argc, char **argv)
g_option_context_free (context);
- if (!egg_get_desktop_file ()) {
- g_set_application_name (_("Panel"));
- gtk_window_set_default_icon_name (PANEL_ICON_PANEL);
- }
-
if (!panel_shell_register (replace)) {
panel_cleanup_do ();
return 1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]