[gdm] Remove notification area



commit 981bcf1335ae11d04231c0adc2a2c1b1b00a0ed9
Author: William Jon McCann <jmccann redhat com>
Date:   Thu Jan 13 20:47:45 2011 -0500

    Remove notification area
    
    https://bugzilla.gnome.org/show_bug.cgi?id=639284

 configure.ac                                       |    1 -
 gui/simple-greeter/Makefile.am                     |    7 -
 gui/simple-greeter/gdm-greeter-panel.c             |   13 -
 gui/simple-greeter/libnotificationarea/Makefile.am |   57 --
 gui/simple-greeter/libnotificationarea/fixedtip.c  |  265 ------
 gui/simple-greeter/libnotificationarea/fixedtip.h  |   68 --
 .../libnotificationarea/na-marshal.list            |    3 -
 .../libnotificationarea/na-tray-child.c            |  532 ------------
 .../libnotificationarea/na-tray-child.h            |   71 --
 .../libnotificationarea/na-tray-manager.c          |  888 --------------------
 .../libnotificationarea/na-tray-manager.h          |  100 ---
 gui/simple-greeter/libnotificationarea/na-tray.c   |  857 -------------------
 gui/simple-greeter/libnotificationarea/na-tray.h   |   69 --
 13 files changed, 0 insertions(+), 2931 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 489c605..60135ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1393,7 +1393,6 @@ daemon/Makefile
 docs/Makefile
 gui/Makefile
 gui/simple-greeter/Makefile
-gui/simple-greeter/libnotificationarea/Makefile
 gui/simple-chooser/Makefile
 utils/Makefile
 data/gdm.conf
diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am
index 6f7f3ee..de9fda2 100644
--- a/gui/simple-greeter/Makefile.am
+++ b/gui/simple-greeter/Makefile.am
@@ -1,13 +1,8 @@
 NULL =
 
-SUBDIRS = 				\
-	libnotificationarea		\
-	$(NULL)
-
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/common				\
 	-I$(top_builddir)/common			\
-	-I$(top_srcdir)/gui/simple-greeter/libnotificationarea	\
 	-DDMCONFDIR=\""$(dmconfdir)"\"			\
 	-DGDMCONFDIR=\"$(gdmconfdir)\"                  \
 	-DDATADIR=\""$(datadir)"\"		 	\
@@ -138,7 +133,6 @@ test_greeter_panel_SOURCES = 	\
 
 test_greeter_panel_LDADD =	\
 	$(top_builddir)/common/libgdmcommon.la	\
-	$(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la	\
 	$(SIMPLE_GREETER_LIBS)		\
 	$(GTK_LIBS)			\
 	$(GCONF_LIBS)			\
@@ -325,7 +319,6 @@ gdm_simple_greeter_SOURCES =  		\
 gdm_simple_greeter_LDADD = 		\
 	$(top_builddir)/common/libgdmcommon.la	\
 	libgdmuser.la			\
-	$(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la	\
 	$(COMMON_LIBS)			\
 	$(EXTRA_GREETER_LIBS)   	\
 	$(SIMPLE_GREETER_LIBS)		\
diff --git a/gui/simple-greeter/gdm-greeter-panel.c b/gui/simple-greeter/gdm-greeter-panel.c
index 8fe616d..acd9663 100644
--- a/gui/simple-greeter/gdm-greeter-panel.c
+++ b/gui/simple-greeter/gdm-greeter-panel.c
@@ -52,8 +52,6 @@
 #include "gdm-profile.h"
 #include "gdm-common.h"
 
-#include "na-tray.h"
-
 #define CK_NAME              "org.freedesktop.ConsoleKit"
 #define CK_MANAGER_PATH      "/org/freedesktop/ConsoleKit/Manager"
 #define CK_MANAGER_INTERFACE "org.freedesktop.ConsoleKit.Manager"
@@ -77,7 +75,6 @@ struct GdmGreeterPanelPrivate
         GtkWidget              *alignment;
         GtkWidget              *hostname_label;
         GtkWidget              *clock;
-        NaTray                 *tray;
         GtkWidget              *shutdown_button;
         GtkWidget              *shutdown_menu;
 
@@ -713,7 +710,6 @@ update_colors (GtkWidget *widget)
 static void
 setup_panel (GdmGreeterPanel *panel)
 {
-        int           padding;
         GtkSizeGroup *sg;
 
         gdm_profile_start (NULL);
@@ -817,15 +813,6 @@ setup_panel (GdmGreeterPanel *panel)
                 gtk_widget_show_all (GTK_WIDGET (panel->priv->shutdown_button));
         }
 
-
-        panel->priv->tray = na_tray_new_for_screen (gtk_window_get_screen (GTK_WINDOW (panel)),
-                                                    GTK_ORIENTATION_HORIZONTAL);
-
-        padding = gconf_client_get_int (panel->priv->client, KEY_NOTIFICATION_AREA_PADDING, NULL);
-        na_tray_set_padding (panel->priv->tray, padding);
-        gtk_box_pack_end (GTK_BOX (panel->priv->right_hbox), GTK_WIDGET (panel->priv->tray), FALSE, FALSE, 6);
-        gtk_widget_show (GTK_WIDGET (panel->priv->tray));
-
         panel->priv->progress = 0.0;
         panel->priv->animation_timer = gdm_timer_new ();
         g_signal_connect_swapped (panel->priv->animation_timer,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]