Your message dated Sun, 20 Jul 2008 12:40:54 +0100
with message-id <[EMAIL PROTECTED]>
and subject line wmcliphist removed from Debian
has caused the Debian Bug report #437433,
regarding wmcliphist: Patch for GTK+ 2.0
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)


-- 
437433: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=437433
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Package: wmcliphist
Tags: patch

Hi,

Attached is a patch for wmbubble to build against GTK+ 2.0:
 - changes the required bits in the Makefile
 - splits foo_create_main_icon_window() and creates foo_set_wmhints(),
   as WMHints need to be set later on, once the windows are shown
 - uses the new function in wmcliphist.c

Please apply, as it'll help clear the list of GTK+1.2 applications.

Thanks,

JB.

-- 
 Julien BLACHE <[EMAIL PROTECTED]>  |  Debian, because code matters more 
 Debian & GNU/Linux Developer        |       <http://www.debian.org>
 Public key available on <http://www.jblache.org> - KeyID: F5D6 5169 
 GPG Fingerprint : 935A 79F1 C8B3 3521 FD62 7CC7 CD61 4FD7 F5D6 5169 

diff -ru orig/wmcliphist-0.6/Makefile wmcliphist-0.6/Makefile
--- orig/wmcliphist-0.6/Makefile	2003-06-24 00:35:45.000000000 +0200
+++ wmcliphist-0.6/Makefile	2007-08-12 16:21:16.772090470 +0200
@@ -1,6 +1,6 @@
 CC = gcc
 
-INCLUDES = `gtk-config --cflags` -I. -Ifoodock -g
+INCLUDES = `pkg-config gtk+-2.0 --cflags` -I. -Ifoodock -g
 
 DESTDIR = "/usr/local/bin"
 
@@ -15,7 +15,7 @@
 #DEBUG = debug.o
 
 
-LFLAGS = `gtk-config --libs`
+LFLAGS = `pkg-config gtk+-2.0 --libs`
 
 
 OBJECTS = wmcliphist.o clipboard.o gui.o rcconfig.o history.o hotkeys.o $(DEBUG)
diff -ru orig/wmcliphist-0.6/foodock/foodock.c wmcliphist-0.6/foodock/foodock.c
--- orig/wmcliphist-0.6/foodock/foodock.c	2001-03-16 01:59:46.000000000 +0100
+++ wmcliphist-0.6/foodock/foodock.c	2007-08-12 16:34:44.818138390 +0200
@@ -21,6 +21,8 @@
  * before calling foo_create_main_icon_window. Returned event box
  * will be realized by foo_create_main_icon_window. You should to show
  * icon window as well as main window before gtk_main().
+ *
+ * Call foo_set_wmhints() after both windows are shown (gtk_widget_show()).
  * 
  * Input:
  *	mw		Pointer to main window
@@ -34,20 +36,37 @@
 				       char *margv[]) {
 
     GtkWidget *foobox; /* This will become icon box */
-    Window xmw;
-    XWMHints *wm_hints;
-
-    xmw = GDK_WINDOW_XWINDOW(mw->window);
     
     foobox = gtk_event_box_new();
     gtk_widget_set_usize(foobox, s, s);
     gtk_container_add (GTK_CONTAINER (mw), foobox);
     gtk_widget_realize(foobox);
-    
+
+    return foobox;
+}
+
+/*
+ * Set WMHints on the dockapp (icon) window. Needs to be called after
+ * the main window is shown, due to changes in GTK+ 2.4.
+ * 
+ * Input:
+ *	mw		Pointer to main window
+ *	dw		Pointer to icon (dockapp) window
+ *	margc, margv	argc and argv of main program for XSetCommand
+ */
+void foo_set_wmhints(GtkWidget *mw,
+		     GtkWidget *dw,
+		     int margc,
+		     char *margv[]) {
+    Window xmw;
+    XWMHints *wm_hints;
+
+    xmw = GDK_WINDOW_XWINDOW(mw->window);
+
 /* Time for game with Xlib */
     wm_hints = XAllocWMHints();
     wm_hints->window_group = xmw;
-    wm_hints->icon_window = GDK_WINDOW_XWINDOW(foobox->window);
+    wm_hints->icon_window = GDK_WINDOW_XWINDOW(dw->window);
     wm_hints->icon_x = 0;
     wm_hints->icon_y = 0; 
     wm_hints->initial_state = WithdrawnState;
@@ -60,6 +79,4 @@
     XSetCommand(GDK_DISPLAY(), xmw, margv, margc);
     
     XFree(wm_hints);
-    
-    return foobox;
 }
diff -ru orig/wmcliphist-0.6/foodock/foodock.h wmcliphist-0.6/foodock/foodock.h
--- orig/wmcliphist-0.6/foodock/foodock.h	2001-03-16 01:59:52.000000000 +0100
+++ wmcliphist-0.6/foodock/foodock.h	2007-08-12 16:34:40.317881934 +0200
@@ -15,6 +15,8 @@
  * before calling foo_create_main_icon_window. Returned event box
  * will be realized by foo_create_main_icon_window. You should to show
  * icon window as well as main window before gtk_main().
+ *
+ * Call foo_set_wmhints() after both windows are shown (gtk_widget_show()).
  * 
  * Input:
  *	mw		Pointer to main window
@@ -25,3 +27,17 @@
 				       unsigned int size,
 				       int main_argc,
 				       char *main_argv[]);
+
+/*
+ * Set WMHints on the dockapp (icon) window. Needs to be called after
+ * the main window is shown, due to changes in GTK+ 2.4.
+ * 
+ * Input:
+ *	mw		Pointer to main window
+ *	dw		Pointer to icon (dockapp) window
+ *	margc, margv	argc and argv of main program for XSetCommand
+ */
+void foo_set_wmhints(GtkWidget *mw,
+		     GtkWidget *dw,
+		     int margc,
+		     char *margv[]);
diff -ru orig/wmcliphist-0.6/wmcliphist.c wmcliphist-0.6/wmcliphist.c
--- orig/wmcliphist-0.6/wmcliphist.c	2003-06-23 23:24:24.000000000 +0200
+++ wmcliphist-0.6/wmcliphist.c	2007-08-12 16:31:20.806512430 +0200
@@ -333,6 +333,10 @@
 	/* show icon */
 	gtk_widget_show(dock_app);
 	gtk_widget_show(main_window);
+
+	/* Set WMHints - after gtk_widget_show() due to changes in GTK+ 2.4 */
+	foo_set_wmhints(main_window, dock_app, argc, argv);
+
 	gdk_window_shape_combine_mask(main_window->window, icon_mask, 0, 0);
 	gdk_window_shape_combine_mask(dock_app->window, icon_mask, 0, 0);
 

--- End Message ---
--- Begin Message ---
wmcliphist has been orphaned and removed from Debian. I am
therefore closing the open bugs.


-- 
Jon Dowland


--- End Message ---

Reply via email to