tGtkUrl code made to compile properly under Win32 - vaccinewars - be a doctor a… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit b84bd88acc3f259aa9574871b75e6e6059337c31 | |
parent 0ad2fbafb5dd27fb311616c0d43634c23a7edc3c | |
Author: Ben Webb <[email protected]> | |
Date: Fri, 15 Feb 2002 23:45:07 +0000 | |
GtkUrl code made to compile properly under Win32 | |
Diffstat: | |
M src/dopewars.c | 5 +---- | |
M src/dopewars.h | 2 +- | |
M src/gtkport.c | 2 ++ | |
3 files changed, 4 insertions(+), 5 deletions(-) | |
--- | |
diff --git a/src/dopewars.c b/src/dopewars.c | |
t@@ -74,9 +74,9 @@ gboolean WantHelp,WantVersion,WantAntique,WantColour,WantNet… | |
gboolean MinToSysTray=TRUE; | |
#else | |
gboolean Daemonize=TRUE; | |
-gchar *WebBrowser = NULL; | |
#endif | |
+gchar *WebBrowser = NULL; | |
gint ConfigErrors=0; | |
ClientType WantedClient; | |
t@@ -1823,11 +1823,8 @@ void SetupParameters(void) { | |
g_free(HiScoreFile); g_free(ServerName); | |
HiScoreFile=g_strdup_printf("%s/dopewars.sco",DATADIR); | |
ServerName=g_strdup("localhost"); | |
- | |
-#ifndef CYGWIN | |
g_free(WebBrowser); | |
WebBrowser = g_strdup("/usr/bin/mozilla"); | |
-#endif | |
CopyNames(&Names,&DefaultNames); | |
CopyDrugs(&Drugs,&DefaultDrugs); | |
diff --git a/src/dopewars.h b/src/dopewars.h | |
t@@ -161,8 +161,8 @@ extern gboolean WantHelp,WantVersion,WantAntique,WantColou… | |
extern gboolean MinToSysTray; | |
#else | |
extern gboolean Daemonize; | |
-extern gchar *WebBrowser; | |
#endif | |
+extern gchar *WebBrowser; | |
extern ClientType WantedClient; | |
extern int LoanSharkLoc,BankLoc,GunShopLoc,RoughPubLoc; | |
extern int DrugSortMethod,FightTimeout,IdleTimeout,ConnectTimeout; | |
diff --git a/src/gtkport.c b/src/gtkport.c | |
t@@ -119,6 +119,8 @@ static void gtk_label_size_request(GtkWidget *widget, | |
GtkRequisition *requisition); | |
static void gtk_label_set_size(GtkWidget *widget, | |
GtkAllocation *allocation); | |
+static void gtk_url_size_request(GtkWidget *widget, | |
+ GtkRequisition *requisition); | |
static void gtk_label_destroy(GtkWidget *widget); | |
static void gtk_url_destroy(GtkWidget *widget); | |
static void gtk_label_realize(GtkWidget *widget); |