[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r1273 - in gnunet-gtk/src: common core include plugins/abou
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r1273 - in gnunet-gtk/src: common core include plugins/about plugins/daemon plugins/fs |
|
Date: |
Tue, 5 Jul 2005 12:49:59 -0700 (PDT) |
Author: grothoff
Date: 2005-07-05 12:49:49 -0700 (Tue, 05 Jul 2005)
New Revision: 1273
Modified:
gnunet-gtk/src/common/Makefile.am
gnunet-gtk/src/common/helper.c
gnunet-gtk/src/core/Makefile.am
gnunet-gtk/src/core/main.c
gnunet-gtk/src/include/helper.h
gnunet-gtk/src/plugins/about/about.c
gnunet-gtk/src/plugins/daemon/daemon.c
gnunet-gtk/src/plugins/fs/download.c
gnunet-gtk/src/plugins/fs/fs.c
gnunet-gtk/src/plugins/fs/search.c
gnunet-gtk/src/plugins/fs/upload.c
Log:
win32 fixes
Modified: gnunet-gtk/src/common/Makefile.am
===================================================================
--- gnunet-gtk/src/common/Makefile.am 2005-07-05 19:04:19 UTC (rev 1272)
+++ gnunet-gtk/src/common/Makefile.am 2005-07-05 19:49:49 UTC (rev 1273)
@@ -18,6 +18,7 @@
@GTK_LIBS@ \
@GNUNETGTK_LIBS@ \
$(INTLLIBS) \
+ -lgnunetutil \
-lgthread-2.0
Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c 2005-07-05 19:04:19 UTC (rev 1272)
+++ gnunet-gtk/src/common/helper.c 2005-07-05 19:49:49 UTC (rev 1273)
@@ -27,11 +27,11 @@
#define HELPER_DEBUG NO
-GladeXML * mainXML;
+static GladeXML * mainXML;
-char *gladeFile = NULL;
+static char *gladeFile = NULL;
-GtkWidget * infoWindow = NULL;
+static GtkWidget * infoWindow = NULL;
static GtkWidget * infoText = NULL;
@@ -44,6 +44,9 @@
static int saveCallsUp;
+static GtkNotebook * notebook = NULL;
+
+
/**
* Call a callback function from the mainloop/main thread ("SaveCall").
* Since GTK doesn't work with multi-threaded applications under Windows,
@@ -397,8 +400,6 @@
(void*) txt);
}
-GtkNotebook * notebook = NULL;
-
gint doAddToNotebook(SaveCall *call) {
GtkWidget * label = gtk_label_new(((AddNotebook *) call->args)->labelName);
gtk_notebook_append_page(notebook,
@@ -507,4 +508,35 @@
return(1);
}
+void initGlade() {
+ /* load the interface */
+#ifdef MINGW
+ gladeFile = MALLOC(_MAX_PATH + 1);
+ plibc_conv_to_win_path(PACKAGE_DATA_DIR"/gnunet-gtk.glade", gladeFile);
+#else
+ gladeFile = STRDUP(PACKAGE_DATA_DIR"/gnunet-gtk.glade");
+#endif
+
+ mainXML = glade_xml_new(gladeFile,
+ "mainWindow",
+ NULL);
+}
+
+void doneGlade() {
+ UNREF(mainXML);
+ mainXML = NULL;
+ FREE(gladeFile);
+ gladeFile = NULL;
+}
+
+const char * getGladeFileName() {
+ return gladeFile;
+}
+
+GladeXML * getMainXML() {
+ return mainXML;
+}
+
+
+
/* end of helper.c */
Modified: gnunet-gtk/src/core/Makefile.am
===================================================================
--- gnunet-gtk/src/core/Makefile.am 2005-07-05 19:04:19 UTC (rev 1272)
+++ gnunet-gtk/src/core/Makefile.am 2005-07-05 19:49:49 UTC (rev 1273)
@@ -15,6 +15,6 @@
$(INTLLIBS) \
-lgthread-2.0 \
$(top_builddir)/src/common/libgnunetgtk_common.la
-
+
gnunet_gtk_LDFLAGS = \
-export-dynamic
Modified: gnunet-gtk/src/core/main.c
===================================================================
--- gnunet-gtk/src/core/main.c 2005-07-05 19:04:19 UTC (rev 1272)
+++ gnunet-gtk/src/core/main.c 2005-07-05 19:49:49 UTC (rev 1273)
@@ -121,7 +121,7 @@
handler_name);
return;
}
- glade_xml_signal_connect(mainXML,
+ glade_xml_signal_connect(getMainXML(),
handler_name,
(GCallback) method);
}
@@ -202,19 +202,9 @@
startCron();
gtkInitSaveCalls();
- /* load the interface */
-#ifdef MINGW
- gladeFile = MALLOC(_MAX_PATH + 1);
- plibc_conv_to_win_path(PACKAGE_DATA_DIR"/gnunet-gtk.glade", gladeFile);
-#else
- gladeFile = STRDUP(PACKAGE_DATA_DIR"/gnunet-gtk.glade");
-#endif
-
- mainXML = glade_xml_new(gladeFile,
- "mainWindow",
- NULL);
+ initGlade();
root
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"mainWindow");
/* load the plugins */
@@ -229,7 +219,8 @@
gtk_widget_show(root);
/* connect the signals in the interface */
setCustomLogProc(&addLogEntry);
- glade_xml_signal_autoconnect_full(mainXML, &connector, plugin);
+ glade_xml_signal_autoconnect_full(getMainXML(),
+ &connector, plugin);
/* start the event loop */
gdk_threads_enter();
@@ -248,9 +239,8 @@
}
gtkDoneSaveCalls();
- UNREF(mainXML);
+ doneGlade();
doneUtil();
- FREE(gladeFile);
return 0;
}
Modified: gnunet-gtk/src/include/helper.h
===================================================================
--- gnunet-gtk/src/include/helper.h 2005-07-05 19:04:19 UTC (rev 1272)
+++ gnunet-gtk/src/include/helper.h 2005-07-05 19:49:49 UTC (rev 1273)
@@ -35,10 +35,14 @@
#include <gtk/gtktext.h>
#include <glade/glade.h>
-extern GladeXML * mainXML;
+const char * getGladeFileName(void);
-extern char * gladeFile;
+GladeXML * getMainXML(void);
+void initGlade(void);
+
+void doneGlade(void);
+
typedef struct {
Semaphore *sem;
void *args;
Modified: gnunet-gtk/src/plugins/about/about.c
===================================================================
--- gnunet-gtk/src/plugins/about/about.c 2005-07-05 19:04:19 UTC (rev
1272)
+++ gnunet-gtk/src/plugins/about/about.c 2005-07-05 19:49:49 UTC (rev
1273)
@@ -37,7 +37,7 @@
GladeXML * axml;
axml
- = glade_xml_new(gladeFile,
+ = glade_xml_new(getGladeFileName(),
"aboutDialog",
NULL);
ad
@@ -51,7 +51,7 @@
GtkWidget * tab;
tab
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"aboutButton");
gtk_widget_show(tab);
}
Modified: gnunet-gtk/src/plugins/daemon/daemon.c
===================================================================
--- gnunet-gtk/src/plugins/daemon/daemon.c 2005-07-05 19:04:19 UTC (rev
1272)
+++ gnunet-gtk/src/plugins/daemon/daemon.c 2005-07-05 19:49:49 UTC (rev
1273)
@@ -42,16 +42,16 @@
if (once) {
once = 0;
killEntry
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"stopDaemon");
launchEntry
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"startDaemon");
statsEntryYes
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"statusPixmapYes");
statsEntryNo
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"statusPixmapNo");
host = getConfigurationString("NETWORK",
"HOST");
@@ -96,7 +96,7 @@
gpointer data) {
GtkWidget * launchEntry;
launchEntry
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"startDaemon");
gtk_widget_set_sensitive(launchEntry, FALSE);
if (OK == checkGNUnetDaemonRunning() ) {
@@ -119,7 +119,7 @@
gpointer data) {
GtkWidget * killEntry = NULL;
killEntry
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"stopDaemon");
gtk_widget_set_sensitive(killEntry, FALSE);
@@ -137,7 +137,7 @@
GtkWidget * tab;
tab
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"daemonScrolledWindow");
gtk_widget_show(tab);
Modified: gnunet-gtk/src/plugins/fs/download.c
===================================================================
--- gnunet-gtk/src/plugins/fs/download.c 2005-07-05 19:04:19 UTC (rev
1272)
+++ gnunet-gtk/src/plugins/fs/download.c 2005-07-05 19:49:49 UTC (rev
1273)
@@ -395,7 +395,7 @@
GtkTreeSelection * selection;
GtkWidget * downloadList;
- downloadList = glade_xml_get_widget(mainXML,
+ downloadList = glade_xml_get_widget(getMainXML(),
"activeDownloadsList");
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(downloadList));
gtk_tree_selection_selected_foreach
@@ -444,7 +444,7 @@
GtkCellRenderer * renderer;
- downloadList = glade_xml_get_widget(mainXML,
+ downloadList = glade_xml_get_widget(getMainXML(),
"activeDownloadsList");
summary =
gtk_tree_store_new(DOWNLOAD_NUM,
Modified: gnunet-gtk/src/plugins/fs/fs.c
===================================================================
--- gnunet-gtk/src/plugins/fs/fs.c 2005-07-05 19:04:19 UTC (rev 1272)
+++ gnunet-gtk/src/plugins/fs/fs.c 2005-07-05 19:49:49 UTC (rev 1273)
@@ -133,7 +133,7 @@
GtkWidget * tab;
tab
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"fsnotebook");
gtk_widget_show(tab);
Modified: gnunet-gtk/src/plugins/fs/search.c
===================================================================
--- gnunet-gtk/src/plugins/fs/search.c 2005-07-05 19:04:19 UTC (rev 1272)
+++ gnunet-gtk/src/plugins/fs/search.c 2005-07-05 19:49:49 UTC (rev 1273)
@@ -318,7 +318,7 @@
FREE(list);
notebook
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"downloadNotebook");
index = -1;
for (i=gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook))-1;i>=0;i--)
@@ -368,7 +368,7 @@
GladeXML * searchXML;
searchXML
- = glade_xml_new(gladeFile,
+ = glade_xml_new(getGladeFileName(),
"searchResultsFrame",
NULL);
glade_xml_signal_autoconnect(searchXML);
@@ -457,7 +457,7 @@
SearchList * list;
searchKeywordGtkCB
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"fssearchKeywordComboBoxEntry");
entry = gtk_bin_get_child(GTK_BIN(searchKeywordGtkCB));
ss = gtk_entry_get_text(GTK_ENTRY(entry));
@@ -478,7 +478,7 @@
}
searchNamespaceGtkCB
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"searchNamespaceComboBoxEntry");
entry = gtk_bin_get_child(GTK_BIN(searchNamespaceGtkCB));
ns = gtk_entry_get_text(GTK_ENTRY(entry));
@@ -522,7 +522,7 @@
ss);
}
notebook
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"downloadNotebook");
list = head;
pages = gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook));
@@ -576,7 +576,7 @@
gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook),
pages);
gtk_widget_show(notebook);
- spin = glade_xml_get_widget(mainXML,
+ spin = glade_xml_get_widget(getMainXML(),
"searchAnonymitySelectionSpinButton");
FSUI_startSearch(ctx,
gtk_spin_button_get_value_as_int
@@ -634,7 +634,7 @@
(FSUI_NamespaceIterator)&addNamespace,
model);
searchNamespaceCB
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"searchNamespaceComboBoxEntry");
gtk_combo_box_set_model(GTK_COMBO_BOX(searchNamespaceCB),
GTK_TREE_MODEL(model));
@@ -710,7 +710,7 @@
list->model
= GTK_TREE_MODEL(model);
notebook
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"downloadNotebook");
gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
list->searchpage,
@@ -733,7 +733,7 @@
GtkCellRenderer * renderer;
searchCB
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"fssearchKeywordComboBoxEntry");
model = gtk_list_store_new(1, G_TYPE_STRING);
@@ -746,7 +746,7 @@
5 * cronMINUTES,
NULL);
- searchList = glade_xml_get_widget(mainXML,
+ searchList = glade_xml_get_widget(getMainXML(),
"activeSearchesSummary");
summary =
gtk_list_store_new(SER_SUM_NUM,
Modified: gnunet-gtk/src/plugins/fs/upload.c
===================================================================
--- gnunet-gtk/src/plugins/fs/upload.c 2005-07-05 19:04:19 UTC (rev 1272)
+++ gnunet-gtk/src/plugins/fs/upload.c 2005-07-05 19:49:49 UTC (rev 1273)
@@ -404,13 +404,13 @@
FREE(config);
}
- uploadLine = glade_xml_get_widget(mainXML,
+ uploadLine = glade_xml_get_widget(getMainXML(),
"uploadFilenameComboBoxEntry");
entry = gtk_bin_get_child(GTK_BIN(uploadLine));
filename = gtk_entry_get_text(GTK_ENTRY(entry));
metaXML
- = glade_xml_new(gladeFile,
+ = glade_xml_new(getGladeFileName(),
"metaDataDialog",
NULL);
glade_xml_signal_autoconnect(metaXML);
@@ -526,13 +526,13 @@
int doIndex;
int doRec;
- recBut = glade_xml_get_widget(mainXML,
+ recBut = glade_xml_get_widget(getMainXML(),
"scopeRecursiveButton");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(recBut)))
doRec = YES;
else
doRec = NO;
- idxBut = glade_xml_get_widget(mainXML,
+ idxBut = glade_xml_get_widget(getMainXML(),
"indexbutton");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(idxBut)))
doIndex = YES;
@@ -640,7 +640,7 @@
GROW(keywords,
ksize,
0);
- spin = glade_xml_get_widget(mainXML,
+ spin = glade_xml_get_widget(getMainXML(),
"uploadAnonymityLevelSpinButton");
if (doRec) {
gkeywordURI = ECRS_stringToUri(ECRS_URI_PREFIX
@@ -679,14 +679,14 @@
char *ret;
uploadXML
- = glade_xml_new(gladeFile,
+ = glade_xml_new(getGladeFileName(),
"uploadfilechooserdialog",
NULL);
glade_xml_signal_autoconnect(uploadXML);
dialog = glade_xml_get_widget(uploadXML,
"uploadfilechooserdialog");
- recBut = glade_xml_get_widget(mainXML,
+ recBut = glade_xml_get_widget(getMainXML(),
"scopeRecursiveButton");
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(recBut)))
@@ -720,7 +720,7 @@
GtkTreeIter iter;
if ((filename = selectFile())) {
- uploadLine = glade_xml_get_widget(mainXML,
+ uploadLine = glade_xml_get_widget(getMainXML(),
"uploadFilenameComboBoxEntry");
entry = gtk_bin_get_child(GTK_BIN(uploadLine));
gtk_entry_set_text(GTK_ENTRY(entry),
@@ -744,7 +744,7 @@
GtkCellRenderer * renderer;
GtkListStore * model;
- uploadList = glade_xml_get_widget(mainXML,
+ uploadList = glade_xml_get_widget(getMainXML(),
"activeUploadsList");
summary =
gtk_tree_store_new(UPLOAD_NUM,
@@ -771,7 +771,7 @@
uploadEntry
- = glade_xml_get_widget(mainXML,
+ = glade_xml_get_widget(getMainXML(),
"uploadFilenameComboBoxEntry");
model = gtk_list_store_new(1, G_TYPE_STRING);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r1273 - in gnunet-gtk/src: common core include plugins/about plugins/daemon plugins/fs,
grothoff <=