aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-08-31 07:32:50 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2005-08-31 07:32:50 +0000
commit68814466894003778231a186f47ce885ec222593 (patch)
tree9d017bd031358c89730fbc00fb3f2981665a8fbf
parentad72787db3616726e7ee1b3d866b571101f0dd52 (diff)
enable compilation on MinGW.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@532 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.ja4
-rw-r--r--src/trayicon.c20
3 files changed, 27 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d343b90..1346027e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2005-08-31
+ * src/trayicon.c: enable compilation on MinGW.
+
+2005-08-31
+
* libsylph/prefs.[ch]: added prefs_param_table_get() and
prefs_param_table_destroy().
prefs_config_parse_one_line(): optimized by using
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 58af52c5..f94f1661 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,9 @@
2005-08-31
+ * src/trayicon.c: MinGW でコンパイルできるようにした。
+
+2005-08-31
+
* libsylph/prefs.[ch]: prefs_param_table_get() と
prefs_param_table_destroy() を追加。
prefs_config_parse_one_line(): prefs_param_table_get() を使用して
diff --git a/src/trayicon.c b/src/trayicon.c
index 537b7671..02f8fb2b 100644
--- a/src/trayicon.c
+++ b/src/trayicon.c
@@ -35,6 +35,7 @@
#include "eggtrayicon.h"
#include "stock_pixmap.h"
+#ifdef GDK_WINDOWING_X11
static GtkWidget *trayicon;
static GtkWidget *trayicon_img;
@@ -54,7 +55,7 @@ GtkWidget *trayicon_create(MainWindow *mainwin)
g_signal_connect(G_OBJECT(eventbox), "button_press_event",
G_CALLBACK(trayicon_button_pressed), mainwin);
trayicon_img = stock_pixbuf_widget_scale(NULL, STOCK_PIXMAP_SYLPHEED,
- 24, 24);
+ 24, 24);
gtk_container_add(GTK_CONTAINER(eventbox), trayicon_img);
trayicon_tip = gtk_tooltips_new();
@@ -90,3 +91,20 @@ static void trayicon_button_pressed(GtkWidget *widget, GdkEventButton *event,
if (event && event->button == 1)
gtk_window_present(GTK_WINDOW(mainwin->window));
}
+
+#else /* GDK_WINDOWING_X11 */
+
+GtkWidget *trayicon_create(MainWindow *mainwin)
+{
+ return NULL;
+}
+
+void trayicon_set_tooltip(const gchar *text)
+{
+}
+
+void trayicon_set_stock_icon(StockPixmap icon)
+{
+}
+
+#endif /* GDK_WINDOWING_X11 */