File patch1.patch of Package wmclockmon
diff -ur wmclockmon-0.8.1.orig/wmclockmon-cal/Makefile.in wmclockmon-0.8.1/wmclockmon-cal/Makefile.in
--- wmclockmon-0.8.1.orig/wmclockmon-cal/Makefile.in 2005-06-15 16:55:27.000000000 +0300
+++ wmclockmon-0.8.1/wmclockmon-cal/Makefile.in 2008-01-13 13:23:11.000000000 +0200
@@ -96,17 +96,17 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I..
-LDFLAGS = @LDFLAGS@ `gtk-config --libs`
+LIBS = @LIBS@ `pkg-config gtk+-2.0 --libs`
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
wmclockmon_OBJECTS = main.o mainwindow.o tools.o
wmclockmon_DEPENDENCIES =
wmclockmon_LDFLAGS =
-CFLAGS = @CFLAGS@ `gtk-config --cflags`
+CFLAGS = @CFLAGS@ `pkg-config gtk+-2.0 --cflags`
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(LDFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LIBS) -o $@
DIST_COMMON = Makefile.am Makefile.in
diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/Makefile.in wmclockmon-0.8.1/wmclockmon-config/Makefile.in
--- wmclockmon-0.8.1.orig/wmclockmon-config/Makefile.in 2005-06-15 16:55:27.000000000 +0300
+++ wmclockmon-0.8.1/wmclockmon-config/Makefile.in 2008-01-13 13:23:44.000000000 +0200
@@ -96,17 +96,17 @@
DEFS = @DEFS@ -I. -I$(srcdir) -I..
-LDFLAGS = @LDFLAGS@ `gtk-config --libs`
+LIBS = @LIBS@ `pkg-config gtk+-2.0 --libs`
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
wmclockmon_OBJECTS = actions.o dialogs.o edit.o main.o mainwindow.o tools.o
wmclockmon_DEPENDENCIES =
wmclockmon_LDFLAGS =
-CFLAGS = @CFLAGS@ `gtk-config --cflags`
+CFLAGS = @CFLAGS@ `pkg-config gtk+-2.0 --cflags`
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+LINK = $(CCLD) $(LDFLAGS) $(AM_CFLAGS) $(CFLAGS) $(LIBS) -o $@
DIST_COMMON = Makefile.am Makefile.in
diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/dialogs.c wmclockmon-0.8.1/wmclockmon-config/dialogs.c
--- wmclockmon-0.8.1.orig/wmclockmon-config/dialogs.c 2005-06-15 16:55:27.000000000 +0300
+++ wmclockmon-0.8.1/wmclockmon-config/dialogs.c 2008-01-13 13:04:53.000000000 +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");
@@ -96,7 +95,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 -ur wmclockmon-0.8.1.orig/wmclockmon-config/edit.c wmclockmon-0.8.1/wmclockmon-config/edit.c
--- wmclockmon-0.8.1.orig/wmclockmon-config/edit.c 2005-06-15 16:55:27.000000000 +0300
+++ wmclockmon-0.8.1/wmclockmon-config/edit.c 2008-01-13 13:04:53.000000000 +0200
@@ -76,7 +76,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");
diff -ur wmclockmon-0.8.1.orig/wmclockmon-config/mainwindow.c wmclockmon-0.8.1/wmclockmon-config/mainwindow.c
--- wmclockmon-0.8.1.orig/wmclockmon-config/mainwindow.c 2005-06-15 16:55:27.000000000 +0300
+++ wmclockmon-0.8.1/wmclockmon-config/mainwindow.c 2008-01-13 13:04:53.000000000 +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,
@@ -20,9 +20,9 @@
GdkEventButton *event,
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;
}
@@ -33,9 +33,9 @@
GdkEventButton *event,
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;
}
@@ -267,7 +267,7 @@
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 0, 1, 1, 2);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
- edit = bouton;
+ b_edit = bouton;
bouton = gtk_button_new_with_label(" Switch On/Off ");
gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
@@ -275,7 +275,7 @@
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 1, 2);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
- set = bouton;
+ b_set = bouton;
bouton = gtk_button_new_with_label(" Remove alarm ");
gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
@@ -283,7 +283,7 @@
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 0, 1);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
- remove = bouton;
+ b_remove = bouton;
label = gtk_label_new(" Alarms ");
@@ -312,7 +312,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 ");
