[gnome-panel] remove last use of libegg
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] remove last use of libegg
- Date: Fri, 7 Nov 2014 02:20:55 +0000 (UTC)
commit 5445c133c4036d96169caa3094b39c8e4d6aa315
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Nov 7 04:01:44 2014 +0200
remove last use of libegg
gnome-panel/main.c | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/gnome-panel/main.c b/gnome-panel/main.c
index 9aec111..35cf287 100644
--- a/gnome-panel/main.c
+++ b/gnome-panel/main.c
@@ -15,9 +15,6 @@
#include <glib/gi18n.h>
#include <glib-unix.h>
-#include <libegg/eggdesktopfile.h>
-#include <libegg/eggsmclient.h>
-
#include <libpanel-util/panel-cleanup.h>
#include <libpanel-util/panel-glib.h>
@@ -93,7 +90,6 @@ on_int_signal (gpointer user_data)
int
main (int argc, char **argv)
{
- char *desktopfile;
GOptionContext *context;
GError *error;
GtkSettings *settings;
@@ -107,12 +103,6 @@ main (int argc, char **argv)
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);
- }
-
context = g_option_context_new ("");
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
@@ -137,10 +127,8 @@ main (int argc, char **argv)
if (session == NULL)
return 1;
- if (!egg_get_desktop_file ()) {
- g_set_application_name (_("Panel"));
- gtk_window_set_default_icon_name (PANEL_ICON_PANEL);
- }
+ g_set_application_name (_("Panel"));
+ gtk_window_set_default_icon_name (PANEL_ICON_PANEL);
panel_action_protocol_init ();
panel_multiscreen_init ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]