Attachment 313053 Details for Bug 457151 – patch to remove eggtrayicon sources

[patch] patch to remove eggtrayicon sources

gnome-ppp-remove_eggtrayicon.patch (text/plain), 11.93 KB, created by Michal Ruzicka on 2008-07-30 23:29:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Ruzicka

Created: 2008-07-30 23:29:48 UTC

Size: 11.93 KB

patch

obsolete

>diff -Naur gnome-ppp-0.3.23.orig/src/eggtrayicon.c gnome-ppp-0.3.23/src/eggtrayicon.c
>--- gnome-ppp-0.3.23.orig/src/eggtrayicon.c	2004-07-08 10:43:18.000000000 +0200
>+++ gnome-ppp-0.3.23/src/eggtrayicon.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,345 +0,0 @@
>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
>-/* eggtrayicon.c
>- * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
>- *
>- * This library is free software; you can redistribute it and/or
>- * modify it under the terms of the GNU Lesser General Public
>- * License as published by the Free Software Foundation; either
>- * version 2 of the License, or (at your option) any later version.
>- *
>- * This library is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>- * Lesser General Public License for more details.
>- *
>- * You should have received a copy of the GNU Lesser General Public
>- * License along with this library; if not, write to the
>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
>- * Boston, MA 02111-1307, USA.
>- */
>-
>-#include <string.h>
>-#include <config.h>
>-#include <gdk/gdkx.h>
>-#include "eggtrayicon.h"
>-
>-#define SYSTEM_TRAY_REQUEST_DOCK    0
>-#define SYSTEM_TRAY_BEGIN_MESSAGE   1
>-#define SYSTEM_TRAY_CANCEL_MESSAGE  2
>-         
>-static GtkPlugClass *parent_class = NULL;
>-
>-static void egg_tray_icon_init (EggTrayIcon *icon);
>-static void egg_tray_icon_class_init (EggTrayIconClass *klass);
>-
>-static void egg_tray_icon_update_manager_window (EggTrayIcon *icon);
>-
>-GType
>-egg_tray_icon_get_type (void)
>-{
>-  static GType our_type = 0;
>-
>-  if (our_type == 0)
>-    {
>-      static const GTypeInfo our_info =
>-      {
>-	sizeof (EggTrayIconClass),
>-	(GBaseInitFunc) NULL,
>-	(GBaseFinalizeFunc) NULL,
>-	(GClassInitFunc) egg_tray_icon_class_init,
>-	NULL, /* class_finalize */
>-	NULL, /* class_data */
>-	sizeof (EggTrayIcon),
>-	0,    /* n_preallocs */
>-	(GInstanceInitFunc) egg_tray_icon_init
>-      };
>-
>-      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
>-    }
>-
>-  return our_type;
>-}
>-
>-static void
>-egg_tray_icon_init (EggTrayIcon *icon)
>-{
>-  icon->stamp = 1;
>-  
>-  gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
>-}
>-
>-static void
>-egg_tray_icon_class_init (EggTrayIconClass *klass)
>-{
>-  parent_class = g_type_class_peek_parent (klass);
>-}
>-
>-static GdkFilterReturn
>-egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data)
>-{
>-  EggTrayIcon *icon = user_data;
>-  XEvent *xev = (XEvent *)xevent;
>-
>-  if (xev->xany.type == ClientMessage &&
>-      xev->xclient.message_type == icon->manager_atom &&
>-      xev->xclient.data.l[1] == icon->selection_atom)
>-    {
>-      egg_tray_icon_update_manager_window (icon);
>-    }
>-  else if (xev->xany.window == icon->manager_window)
>-    {
>-      if (xev->xany.type == DestroyNotify)
>-	{
>-	  egg_tray_icon_update_manager_window (icon);
>-	}
>-    }
>-  
>-  return GDK_FILTER_CONTINUE;
>-}
>-
>-static void
>-egg_tray_icon_send_manager_message (EggTrayIcon *icon,
>-				    long         message,
>-				    Window       window,
>-				    long         data1,
>-				    long         data2,
>-				    long         data3)
>-{
>-  XClientMessageEvent ev;
>-  Display *display;
>-  
>-  ev.type = ClientMessage;
>-  ev.window = window;
>-  ev.message_type = icon->system_tray_opcode_atom;
>-  ev.format = 32;
>-  ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
>-  ev.data.l[1] = message;
>-  ev.data.l[2] = data1;
>-  ev.data.l[3] = data2;
>-  ev.data.l[4] = data3;
>-
>-#if HAVE_GTK_MULTIHEAD
>-  display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
>-#else
>-  display = gdk_display;
>-#endif
>-  
>-  gdk_error_trap_push ();
>-  XSendEvent (display,
>-	      icon->manager_window, False, NoEventMask, (XEvent *)&ev);
>-  XSync (display, False);
>-  gdk_error_trap_pop ();
>-}
>-
>-static void
>-egg_tray_icon_send_dock_request (EggTrayIcon *icon)
>-{
>-  egg_tray_icon_send_manager_message (icon,
>-				      SYSTEM_TRAY_REQUEST_DOCK,
>-				      icon->manager_window,
>-				      gtk_plug_get_id (GTK_PLUG (icon)),
>-				      0, 0);
>-}
>-
>-static void
>-egg_tray_icon_update_manager_window (EggTrayIcon *icon)
>-{
>-  Display *xdisplay;
>-  
>-#if HAVE_GTK_MULTIHEAD
>-  xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
>-#else
>-  xdisplay = gdk_display;
>-#endif
>-  
>-  if (icon->manager_window != None)
>-    {
>-      GdkWindow *gdkwin;
>-
>-#if HAVE_GTK_MULTIHEAD
>-      gdkwin = gdk_window_lookup_for_display (display,
>-					      icon->manager_window);
>-#else
>-      gdkwin = gdk_window_lookup (icon->manager_window);
>-#endif
>-      
>-      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
>-    }
>-  
>-  XGrabServer (xdisplay);
>-  
>-  icon->manager_window = XGetSelectionOwner (xdisplay,
>-					     icon->selection_atom);
>-
>-  if (icon->manager_window != None)
>-    XSelectInput (xdisplay,
>-		  icon->manager_window, StructureNotifyMask);
>-
>-  XUngrabServer (xdisplay);
>-  XFlush (xdisplay);
>-  
>-  if (icon->manager_window != None)
>-    {
>-      GdkWindow *gdkwin;
>-
>-#if HAVE_GTK_MULTIHEAD
>-      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
>-					      icon->manager_window);
>-#else
>-      gdkwin = gdk_window_lookup (icon->manager_window);
>-#endif
>-      
>-      gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
>-
>-      /* Send a request that we'd like to dock */
>-      egg_tray_icon_send_dock_request (icon);
>-    }
>-}
>-
>-EggTrayIcon *
>-egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name);
>-
>-EggTrayIcon *
>-egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name)
>-{
>-  EggTrayIcon *icon;
>-  char buffer[256];
>-  GdkWindow *root_window;
>-
>-  g_return_val_if_fail (xscreen != NULL, NULL);
>-  
>-  icon = g_object_new (EGG_TYPE_TRAY_ICON, NULL);
>-  gtk_window_set_title (GTK_WINDOW (icon), name);
>-
>-#if HAVE_GTK_MULTIHEAD
>-  gtk_plug_construct_for_display (GTK_PLUG (icon),
>-				  gdk_screen_get_display (screen), 0);
>-#else
>-  gtk_plug_construct (GTK_PLUG (icon), 0);
>-#endif
>-  
>-  gtk_widget_realize (GTK_WIDGET (icon));
>-
>-  /* Now see if there's a manager window around */
>-  g_snprintf (buffer, sizeof (buffer),
>-	      "_NET_SYSTEM_TRAY_S%d",
>-	      XScreenNumberOfScreen (xscreen));
>-  
>-  icon->selection_atom = XInternAtom (DisplayOfScreen (xscreen),
>-				      buffer, False);
>-  
>-  icon->manager_atom = XInternAtom (DisplayOfScreen (xscreen),
>-				    "MANAGER", False);
>-  
>-  icon->system_tray_opcode_atom = XInternAtom (DisplayOfScreen (xscreen),
>-					       "_NET_SYSTEM_TRAY_OPCODE", False);
>-
>-  egg_tray_icon_update_manager_window (icon);
>-
>-#if HAVE_GTK_MULTIHEAD
>-  root_window = gdk_screen_get_root_window (screen);
>-#else
>-  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
>-#endif
>-  
>-  /* Add a root window filter so that we get changes on MANAGER */
>-  gdk_window_add_filter (root_window,
>-			 egg_tray_icon_manager_filter, icon);
>-		      
>-  return icon;
>-}
>-
>-#if HAVE_GTK_MULTIHEAD
>-EggTrayIcon *
>-egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
>-{
>-  EggTrayIcon *icon;
>-  char buffer[256];
>-
>-  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
>-
>-  return egg_tray_icon_new_for_xscreen (GDK_SCREEN_XSCREEN (screen), name);
>-}
>-#endif
>-
>-EggTrayIcon*
>-egg_tray_icon_new (const gchar *name)
>-{
>-  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name);
>-}
>-
>-guint
>-egg_tray_icon_send_message (EggTrayIcon *icon,
>-			    gint         timeout,
>-			    const gchar *message,
>-			    gint         len)
>-{
>-  guint stamp;
>-  
>-  g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
>-  g_return_val_if_fail (timeout >= 0, 0);
>-  g_return_val_if_fail (message != NULL, 0);
>-		     
>-  if (icon->manager_window == None)
>-    return 0;
>-
>-  if (len < 0)
>-    len = strlen (message);
>-
>-  stamp = icon->stamp++;
>-  
>-  /* Get ready to send the message */
>-  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
>-				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
>-				      timeout, len, stamp);
>-
>-  /* Now to send the actual message */
>-  gdk_error_trap_push ();
>-  while (len > 0)
>-    {
>-      XClientMessageEvent ev;
>-      Display *xdisplay;
>-
>-#if HAVE_GTK_MULTIHEAD
>-      xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
>-#else
>-      xdisplay = gdk_display;
>-#endif
>-      
>-      ev.type = ClientMessage;
>-      ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
>-      ev.format = 8;
>-      ev.message_type = XInternAtom (xdisplay,
>-				     "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
>-      if (len > 20)
>-	{
>-	  memcpy (&ev.data, message, 20);
>-	  len -= 20;
>-	  message += 20;
>-	}
>-      else
>-	{
>-	  memcpy (&ev.data, message, len);
>-	  len = 0;
>-	}
>-
>-      XSendEvent (xdisplay,
>-		  icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev);
>-      XSync (xdisplay, False);
>-    }
>-  gdk_error_trap_pop ();
>-
>-  return stamp;
>-}
>-
>-void
>-egg_tray_icon_cancel_message (EggTrayIcon *icon,
>-			      guint        id)
>-{
>-  g_return_if_fail (EGG_IS_TRAY_ICON (icon));
>-  g_return_if_fail (id > 0);
>-  
>-  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
>-				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
>-				      id, 0, 0);
>-}
>diff -Naur gnome-ppp-0.3.23.orig/src/eggtrayicon.h gnome-ppp-0.3.23/src/eggtrayicon.h
>--- gnome-ppp-0.3.23.orig/src/eggtrayicon.h	2004-07-08 11:01:53.000000000 +0200
>+++ gnome-ppp-0.3.23/src/eggtrayicon.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,76 +0,0 @@
>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
>-/* eggtrayicon.h
>- * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
>- *
>- * This library is free software; you can redistribute it and/or
>- * modify it under the terms of the GNU Lesser General Public
>- * License as published by the Free Software Foundation; either
>- * version 2 of the License, or (at your option) any later version.
>- *
>- * This library is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>- * Lesser General Public License for more details.
>- *
>- * You should have received a copy of the GNU Lesser General Public
>- * License along with this library; if not, write to the
>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
>- * Boston, MA 02111-1307, USA.
>- */
>-
>-#ifndef __EGG_TRAY_ICON_H__
>-#define __EGG_TRAY_ICON_H__
>-
>-#include <gtk/gtkplug.h>
>-#include <gdk/gdkx.h>
>-
>-G_BEGIN_DECLS
>-
>-#define EGG_TYPE_TRAY_ICON		(egg_tray_icon_get_type ())
>-#define EGG_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
>-#define EGG_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
>-#define EGG_IS_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
>-#define EGG_IS_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
>-#define EGG_TRAY_ICON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
>-	
>-typedef struct _EggTrayIcon	  EggTrayIcon;
>-typedef struct _EggTrayIconClass  EggTrayIconClass;
>-
>-struct _EggTrayIcon
>-{
>-  GtkPlug parent_instance;
>-
>-  guint stamp;
>-  
>-  Atom selection_atom;
>-  Atom manager_atom;
>-  Atom system_tray_opcode_atom;
>-  Window manager_window;
>-};
>-
>-struct _EggTrayIconClass
>-{
>-  GtkPlugClass parent_class;
>-};
>-
>-GType        egg_tray_icon_get_type       (void);
>-
>-#if EGG_TRAY_ENABLE_MULTIHEAD
>-EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
>-					   const gchar *name);
>-#endif
>-
>-EggTrayIcon *egg_tray_icon_new            (const gchar *name);
>-
>-guint        egg_tray_icon_send_message   (EggTrayIcon *icon,
>-					   gint         timeout,
>-					   const char  *message,
>-					   gint         len);
>-void         egg_tray_icon_cancel_message (EggTrayIcon *icon,
>-					   guint        id);
>-
>-
>-					    
>-G_END_DECLS
>-
>-#endif /* __EGG_TRAY_ICON_H__ */

Actions: View | Diff

Attachments on bug 457151: 312937 | 312938 | 313052 | 313053 | 313054 | 313081 | 313082