[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r7114 - gnunet-gtk/src/core
From: |
gnunet |
Subject: |
[GNUnet-SVN] r7114 - gnunet-gtk/src/core |
Date: |
Mon, 9 Jun 2008 16:23:20 -0600 (MDT) |
Author: grothoff
Date: 2008-06-09 16:23:20 -0600 (Mon, 09 Jun 2008)
New Revision: 7114
Modified:
gnunet-gtk/src/core/main.c
Log:
fixing window icon stuff
Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c 2008-06-09 19:05:00 UTC (rev 7113)
+++ gnunet-gtk/src/core/main.c 2008-06-09 22:23:20 UTC (rev 7114)
@@ -86,6 +86,7 @@
struct GNUNET_GC_Configuration *cfg;
char *log;
char *dataDir;
+ char *gtkDataDir;
GNUNET_GE_KIND mask;
#if ENABLE_NLS
char *path;
@@ -136,10 +137,18 @@
my_ctx = GNUNET_GTK_create_gtk_logger (mask);
GNUNET_GE_setDefaultContext (my_ctx);
root =
- glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
- dataDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
- gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), dataDir);
- GNUNET_free (dataDir);
+ glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
+ if (NULL == gtk_window_get_icon(GTK_WINDOW(root)))
+ {
+ /* theme-based loading failed, set directly */
+ dataDir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
+ gtkDataDir =
+ GNUNET_malloc (strlen (dataDir) +
+ strlen ("/../gnunet-gtk/gnunet-gtk.png") + 2);
+ strcpy (gtkDataDir, dataDir);
+ strcat (gtkDataDir, "/../gnunet-gtk/gnunet-gtk.png");
+ gtk_window_set_icon_from_file(GTK_WINDOW(root), gtkDataDir, NULL);
+ }
gtk_window_maximize (GTK_WINDOW (root));
gtk_widget_show (root);
gtk_window_present (GTK_WINDOW (root));
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r7114 - gnunet-gtk/src/core,
gnunet <=