aboutsummaryrefslogtreecommitdiff
path: root/src/core/eggtrayicon.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/eggtrayicon.c')
-rw-r--r--src/core/eggtrayicon.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/core/eggtrayicon.c b/src/core/eggtrayicon.c
index d1fc2a66..4807f9c8 100644
--- a/src/core/eggtrayicon.c
+++ b/src/core/eggtrayicon.c
@@ -71,7 +71,7 @@ struct _EggTrayIcon
71 GtkPlug parent_instance; 71 GtkPlug parent_instance;
72 72
73 guint stamp; 73 guint stamp;
74 74
75 Atom selection_atom; 75 Atom selection_atom;
76 Atom manager_atom; 76 Atom manager_atom;
77 Atom system_tray_opcode_atom; 77 Atom system_tray_opcode_atom;
@@ -107,7 +107,7 @@ GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon *icon);
107 107
108static gboolean tray_clicked (GtkWidget *trayContextMenu, GdkEvent *event); 108static gboolean tray_clicked (GtkWidget *trayContextMenu, GdkEvent *event);
109static gboolean on_tray_quit_activate(GtkWidget *widget, GdkEvent *event, gpointer data); 109static gboolean on_tray_quit_activate(GtkWidget *widget, GdkEvent *event, gpointer data);
110 110
111G_END_DECLS 111G_END_DECLS
112 112
113#define SYSTEM_TRAY_REQUEST_DOCK 0 113#define SYSTEM_TRAY_REQUEST_DOCK 0
@@ -121,7 +121,7 @@ enum {
121 PROP_0, 121 PROP_0,
122 PROP_ORIENTATION 122 PROP_ORIENTATION
123}; 123};
124 124
125static GtkPlugClass *parent_class = NULL; 125static GtkPlugClass *parent_class = NULL;
126 126
127static void egg_tray_icon_init (EggTrayIcon *icon); 127static void egg_tray_icon_init (EggTrayIcon *icon);
@@ -198,7 +198,7 @@ egg_tray_icon_init (EggTrayIcon *icon)
198{ 198{
199 icon->stamp = 1; 199 icon->stamp = 1;
200 icon->orientation = GTK_ORIENTATION_HORIZONTAL; 200 icon->orientation = GTK_ORIENTATION_HORIZONTAL;
201 201
202 gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK); 202 gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
203} 203}
204 204
@@ -320,7 +320,7 @@ egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_
320 egg_tray_icon_manager_window_destroyed (icon); 320 egg_tray_icon_manager_window_destroyed (icon);
321 } 321 }
322 } 322 }
323 323
324 return GDK_FILTER_CONTINUE; 324 return GDK_FILTER_CONTINUE;
325} 325}
326 326
@@ -360,7 +360,7 @@ egg_tray_icon_send_manager_message (EggTrayIcon *icon,
360{ 360{
361 XClientMessageEvent ev; 361 XClientMessageEvent ev;
362 Display *display; 362 Display *display;
363 363
364 ev.type = ClientMessage; 364 ev.type = ClientMessage;
365 ev.window = window; 365 ev.window = window;
366 ev.message_type = icon->system_tray_opcode_atom; 366 ev.message_type = icon->system_tray_opcode_atom;
@@ -395,13 +395,13 @@ egg_tray_icon_update_manager_window (EggTrayIcon *icon,
395 gboolean dock_if_realized) 395 gboolean dock_if_realized)
396{ 396{
397 Display *xdisplay; 397 Display *xdisplay;
398 398
399 if (icon->manager_window != None) 399 if (icon->manager_window != None)
400 return; 400 return;
401 401
402 xdisplay = getDisplay(GTK_WIDGET (icon)); 402 xdisplay = getDisplay(GTK_WIDGET (icon));
403 XGrabServer (xdisplay); 403 XGrabServer (xdisplay);
404 404
405 icon->manager_window = XGetSelectionOwner (xdisplay, 405 icon->manager_window = XGetSelectionOwner (xdisplay,
406 icon->selection_atom); 406 icon->selection_atom);
407 407
@@ -411,7 +411,7 @@ egg_tray_icon_update_manager_window (EggTrayIcon *icon,
411 411
412 XUngrabServer (xdisplay); 412 XUngrabServer (xdisplay);
413 XFlush (xdisplay); 413 XFlush (xdisplay);
414 414
415 if (icon->manager_window != None) 415 if (icon->manager_window != None)
416 { 416 {
417 GdkWindow *gdkwin; 417 GdkWindow *gdkwin;
@@ -430,7 +430,7 @@ static void
430egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon) 430egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
431{ 431{
432 GdkWindow *gdkwin; 432 GdkWindow *gdkwin;
433 433
434 g_return_if_fail (icon->manager_window != None); 434 g_return_if_fail (icon->manager_window != None);
435 435
436 gdkwin = getWindow(icon); 436 gdkwin = getWindow(icon);
@@ -467,9 +467,9 @@ egg_tray_icon_realize (GtkWidget *widget)
467 screen); 467 screen);
468 468
469 icon->selection_atom = XInternAtom (xdisplay, buffer, False); 469 icon->selection_atom = XInternAtom (xdisplay, buffer, False);
470 470
471 icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False); 471 icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False);
472 472
473 icon->system_tray_opcode_atom = XInternAtom (xdisplay, 473 icon->system_tray_opcode_atom = XInternAtom (xdisplay,
474 "_NET_SYSTEM_TRAY_OPCODE", 474 "_NET_SYSTEM_TRAY_OPCODE",
475 False); 475 False);
@@ -515,11 +515,11 @@ egg_tray_icon_send_message (EggTrayIcon *icon,
515 gint len) 515 gint len)
516{ 516{
517 guint stamp; 517 guint stamp;
518 518
519 g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0); 519 g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
520 g_return_val_if_fail (timeout >= 0, 0); 520 g_return_val_if_fail (timeout >= 0, 0);
521 g_return_val_if_fail (message != NULL, 0); 521 g_return_val_if_fail (message != NULL, 0);
522 522
523 if (icon->manager_window == None) 523 if (icon->manager_window == None)
524 return 0; 524 return 0;
525 525
@@ -527,7 +527,7 @@ egg_tray_icon_send_message (EggTrayIcon *icon,
527 len = strlen (message); 527 len = strlen (message);
528 528
529 stamp = icon->stamp++; 529 stamp = icon->stamp++;
530 530
531 /* Get ready to send the message */ 531 /* Get ready to send the message */
532 egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE, 532 egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
533 (Window)gtk_plug_get_id (GTK_PLUG (icon)), 533 (Window)gtk_plug_get_id (GTK_PLUG (icon)),
@@ -574,7 +574,7 @@ egg_tray_icon_cancel_message (EggTrayIcon *icon,
574{ 574{
575 g_return_if_fail (EGG_IS_TRAY_ICON (icon)); 575 g_return_if_fail (EGG_IS_TRAY_ICON (icon));
576 g_return_if_fail (id > 0); 576 g_return_if_fail (id > 0);
577 577
578 egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE, 578 egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
579 (Window)gtk_plug_get_id (GTK_PLUG (icon)), 579 (Window)gtk_plug_get_id (GTK_PLUG (icon)),
580 id, 0, 0); 580 id, 0, 0);
@@ -627,7 +627,7 @@ static gboolean tray_clicked(GtkWidget *widget, GdkEvent *event) {
627} 627}
628 628
629/* Initiate the system tray icon */ 629/* Initiate the system tray icon */
630void initTrayIcon() { 630void initTrayIcon() {
631 static EggTrayIcon *tray_icon; 631 static EggTrayIcon *tray_icon;
632 static GtkWidget *tray_icon_image; 632 static GtkWidget *tray_icon_image;
633 static GtkTooltips *tray_icon_tooltip; 633 static GtkTooltips *tray_icon_tooltip;