chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from Disobedience branch
[disorder]
/
disobedience
/
misc.c
diff --git
a/disobedience/misc.c
b/disobedience/misc.c
index da0db603e3f9769c9cef65b23cfea8050ef0b29b..8c4ed095a61f2b4a8f4568bb8c82e1032d484fc2 100644
(file)
--- a/
disobedience/misc.c
+++ b/
disobedience/misc.c
@@
-33,8
+33,6
@@
struct image {
/* Miscellaneous GTK+ stuff ------------------------------------------------ */
/* Miscellaneous GTK+ stuff ------------------------------------------------ */
-WT(cached_image);
-
/* Functions */
/** @brief Put scrollbars around a widget
/* Functions */
/** @brief Put scrollbars around a widget
@@
-123,7
+121,6
@@
GdkPixbuf *find_image(const char *name) {
return 0;
}
}
return 0;
}
}
- NW(cached_image);
cache_put(&image_cache_type, name, pb);
}
return pb;
cache_put(&image_cache_type, name, pb);
}
return pb;
@@
-167,13
+164,10
@@
GtkWidget *iconbutton(const char *path, const char *tip) {
GtkWidget *button, *content;
GdkPixbuf *pb;
GtkWidget *button, *content;
GdkPixbuf *pb;
- NW(button);
button = gtk_button_new();
if((pb = find_image(path))) {
button = gtk_button_new();
if((pb = find_image(path))) {
- NW(image);
content = gtk_image_new_from_pixbuf(pb);
} else {
content = gtk_image_new_from_pixbuf(pb);
} else {
- NW(label);
content = gtk_label_new(path);
}
gtk_widget_set_style(button, tool_style);
content = gtk_label_new(path);
}
gtk_widget_set_style(button, tool_style);