1 files changed, 6 insertions, 6 deletions

diff --git a/src/core/eggtrayicon.c b/src/core/eggtrayicon.c
index dc3f139e..73620b3f 100644
--- a/src/core/eggtrayicon.c
+++ b/src/core/eggtrayicon.c
@@ -200,7 +200,7 @@ egg_tray_icon_init (EggTrayIcon * icon)
   icon->stamp = 1;
   icon->orientation = GTK_ORIENTATION_HORIZONTAL;
 
-  gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
+  gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGNUNET_GEMASK);
 }
 
 static void
@@ -544,7 +544,7 @@ egg_tray_icon_send_message (EggTrayIcon * icon,
       ev.window = (Window) gtk_plug_get_id (GTK_PLUG (icon));
       ev.format = 8;
       ev.message_type = XInternAtom (xdisplay,
-                                     "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
+                                     "_NET_SYSTEM_TRAY_MESSAGNUNET_GEDATA", False);
       if (len > 20)
         {
           memcpy (&ev.data, message, 20);
@@ -592,7 +592,7 @@ egg_tray_icon_get_orientation (EggTrayIcon * icon)
 static gboolean
 on_tray_quit_activate (GtkWidget * widget, GdkEvent * event, gpointer data)
 {
-  gnunet_gtk_main_quit ();
+  GNUNET_GTK_main_quit ();
   return TRUE;
 }
 
@@ -607,13 +607,13 @@ tray_clicked (GtkWidget * widget, GdkEvent * event)
       if (event_button->button == 1)
         {
           GtkWidget *root;
-          root = glade_xml_get_widget (getMainXML (), "mainWindow");
+          root = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
           GdkWindowState main_window_state;
           if (gtk_window_is_active (GTK_WINDOW (root)))
             gtk_widget_hide (root);
           else
             gtk_window_present (GTK_WINDOW (root));
-          main_window_state = getMainWindowState ();
+          main_window_state = GNUNET_GTK_get_main_window_state ();
           if (main_window_state & GDK_WINDOW_STATE_MAXIMIZED)
             gtk_window_maximize (GTK_WINDOW (root));
           return TRUE;
@@ -645,7 +645,7 @@ initTrayIcon ()
   char *iconPath;
 
   trayContextMenuXML =
-    glade_xml_new (getGladeFileName (), "trayContextMenu", PACKAGE_NAME);
+    glade_xml_new (GNUNET_GTK_get_glade_filename (), "trayContextMenu", PACKAGNUNET_GENAME);
   trayContextMenu =
     glade_xml_get_widget (trayContextMenuXML, "trayContextMenu");
   tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit");