--- Begin Message ---
Package: wmmaiload
Tags: patch
Hi,
Attached is a patch for wmbubble to build against GTK+ 2.0:
- changes the required bits in Init.make
- adjusts a couple of things for GTK+ 2.0
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
Only in orig/wmmaiload-2.2.1/wmmaiload: config.h
Only in wmmaiload-2.2.1/wmmaiload: wmmaiload
Only in orig/wmmaiload-2.2.1/wmmaiload-config: .dependencies
diff -ru orig/wmmaiload-2.2.1/wmmaiload-config/Init.make wmmaiload-2.2.1/wmmaiload-config/Init.make
--- orig/wmmaiload-2.2.1/wmmaiload-config/Init.make 2007-08-12 17:49:55.000000000 +0200
+++ wmmaiload-2.2.1/wmmaiload-config/Init.make 2007-08-12 17:50:59.078810649 +0200
@@ -37,9 +37,9 @@
#
CROSS_COMPILE =
-USER_CPPFLAGS = `gtk-config --cflags`
+USER_CPPFLAGS = `pkg-config gtk+-2.0 --cflags`
USER_CFLAGS =
-USER_LDFLAGS = `gtk-config --libs` -lX11
+USER_LDFLAGS = `pkg-config gtk+-2.0 --libs` -lX11
#*****************************************************************
Only in orig/wmmaiload-2.2.1/wmmaiload-config: config.h
diff -ru orig/wmmaiload-2.2.1/wmmaiload-config/dialogs.c wmmaiload-2.2.1/wmmaiload-config/dialogs.c
--- orig/wmmaiload-2.2.1/wmmaiload-config/dialogs.c 2005-07-07 20:54:17.000000000 +0200
+++ wmmaiload-2.2.1/wmmaiload-config/dialogs.c 2007-08-12 17:51:55.082002090 +0200
@@ -38,7 +38,6 @@
bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
- gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
bouton = gtk_button_new_with_label("No");
@@ -97,7 +96,6 @@
bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
- gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
gtk_container_set_border_width(GTK_CONTAINER
diff -ru orig/wmmaiload-2.2.1/wmmaiload-config/mainwindow.c wmmaiload-2.2.1/wmmaiload-config/mainwindow.c
--- orig/wmmaiload-2.2.1/wmmaiload-config/mainwindow.c 2005-07-13 21:51:52.000000000 +0200
+++ wmmaiload-2.2.1/wmmaiload-config/mainwindow.c 2007-08-12 17:53:14.086504299 +0200
@@ -10,9 +10,9 @@
#include "actions.h"
-static GtkWidget *edit;
-static GtkWidget *set;
-static GtkWidget *remove;
+static GtkWidget *b_edit;
+static GtkWidget *b_set;
+static GtkWidget *b_remove;
static gint list_sel_cb (GtkCList *clist,
gint row,
@@ -21,9 +21,9 @@
void *data)
{
selected_row = row;
- gtk_widget_set_sensitive(edit, TRUE);
- gtk_widget_set_sensitive(set, TRUE);
- gtk_widget_set_sensitive(remove, TRUE);
+ gtk_widget_set_sensitive(b_edit, TRUE);
+ gtk_widget_set_sensitive(b_set, TRUE);
+ gtk_widget_set_sensitive(b_remove, TRUE);
return TRUE;
}
@@ -35,9 +35,9 @@
void *data)
{
selected_row = -1;
- gtk_widget_set_sensitive(edit, FALSE);
- gtk_widget_set_sensitive(set, FALSE);
- gtk_widget_set_sensitive(remove, FALSE);
+ gtk_widget_set_sensitive(b_edit, FALSE);
+ gtk_widget_set_sensitive(b_set, FALSE);
+ gtk_widget_set_sensitive(b_remove, FALSE);
return TRUE;
}
@@ -230,7 +230,7 @@
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 0, 1, 0, 1);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
- edit = bouton;
+ b_edit = bouton;
bouton = gtk_button_new_with_label(" Set default ");
gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
@@ -238,7 +238,7 @@
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 0, 1);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
- set = bouton;
+ b_set = bouton;
bouton = gtk_button_new_with_label(" Remove box ");
gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
@@ -246,7 +246,7 @@
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 2, 3, 0, 1);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
- remove = bouton;
+ b_remove = bouton;
/*--- Frame 5 ---*/
frame = gtk_frame_new(NULL);
@@ -322,7 +322,6 @@
gtk_box_pack_start(GTK_BOX(buttons_hbox), bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
- gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
bouton = gtk_button_new_with_label(" Cancel ");
diff -ru orig/wmmaiload-2.2.1/wmmaiload-config/popedit.c wmmaiload-2.2.1/wmmaiload-config/popedit.c
--- orig/wmmaiload-2.2.1/wmmaiload-config/popedit.c 2005-07-07 20:54:17.000000000 +0200
+++ wmmaiload-2.2.1/wmmaiload-config/popedit.c 2007-08-12 17:52:20.083426839 +0200
@@ -68,7 +68,6 @@
bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
- gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
bouton = gtk_button_new_with_label("Cancel");
Only in wmmaiload-2.2.1/wmmaiload-config: wmmaiload-config
--- End Message ---
