[Ayttm-commits] CVS: ayttm/src browser.c,1.11,1.12 browser.h,1.3,1.4 crash.c,1.7,1.8 gtk_eb_html.c,1.7,1.8 help_menu.c,1.4,1.5

[Andy Maloney <address@hidden>]

Update of /cvsroot/ayttm/ayttm/src
In directory subversions:/tmp/cvs-serv3063/src

Modified Files:
        browser.c browser.h crash.c gtk_eb_html.c help_menu.c 
Log Message:
Remove open_url_nw [it was the same as open_url()]
Cleanup browser.c


Index: browser.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/browser.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- browser.c   16 Jan 2003 13:11:01 -0000      1.11
+++ browser.c   23 Jan 2003 23:07:21 -0000      1.12
@@ -29,36 +29,28 @@
 
 
 #include "intl.h"
-#include <stdio.h>
+
 #include <string.h>
+#include <gtk/gtk.h>
 
 #ifdef __MINGW32__
 #include <gdk/gdkwin32.h>
 #else
-#include <gdk/gdkx.h>
 #include <stdlib.h>
 #endif
 
-#include <gdk/gdkprivate.h>
+#ifdef _WIN32
+#include <shellapi.h>
+#include <process.h>
+#endif
 
-#include "dialog.h"
-#include "util.h"
-#include "gtk_globals.h"
 #include "prefs.h"
+#include "globals.h"
 
-enum
-{
-       BROWSER_NETSCAPE,
-       BROWSER_KFM,
-       BROWSER_MANUAL,
-       BROWSER_INTERNAL
-};
 
 #ifndef _WIN32
-
-gint web_browser = BROWSER_NETSCAPE;
                
-void open_url_nw(GtkWidget *w, char *url) {
+void open_url(GtkWidget *w, char *url) {
        char *browser = NULL;
        char command[1281];
        char *url_pos = NULL;
@@ -90,8 +82,6 @@
        
        if (iGetLocalPref("use_alternate_browser"))
                browser = cGetLocalPref("alternate_browser");
-       else 
-               browser = "mozilla %s";
        
        if (!browser || (strlen(browser) == 0)) {
                browser = "mozilla %s";
@@ -119,23 +109,12 @@
        system(command);
 }
 
-void open_url(GtkWidget *w, char *url) {
-       open_url_nw(w,url);
-}
-
 #else
-#include <shellapi.h>
-#include <process.h>
-gint web_browser = BROWSER_INTERNAL;
 
-void open_url_nw(GdkWindow *w, char *url) {
+void open_url(GdkWindow *w, char *url) {
        if (!w)
                return;
        ShellExecute(GDK_DRAWABLE_XID(w),"open",url,NULL,"C:\\",0);
-}
-
-void open_url(GdkWindow *w, char *url) {
-       open_url_nw(w,url);
 }
 
 #endif // _WIN32

Index: browser.h
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/browser.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- browser.h   20 Jan 2003 18:10:11 -0000      1.3
+++ browser.h   23 Jan 2003 23:07:21 -0000      1.4
@@ -31,17 +31,18 @@
 #endif
 
 #include <gdk/gdk.h>
+
 void open_url(GdkWindow *w, char *url);
-void open_url_nw(GdkWindow *w, char *url);
 
 #ifdef __IN_PLUGIN__
 #define extern extern
 #endif
 
 #else
+
 void open_url(void *w, char *url);
-void open_url_nw(void *w, char *url);
-#endif
+
+#endif /* __MINGW32__ */
 
 #ifdef __cplusplus
 } /* extern "C" */

Index: crash.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/crash.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- crash.c     19 Jan 2003 01:52:35 -0000      1.7
+++ crash.c     23 Jan 2003 23:07:21 -0000      1.8
@@ -22,13 +22,10 @@
  * Claws originally) !
  *
  */
-#ifdef HAVE_CONFIG_H
-#      include <config.h>
-#endif
+#include "intl.h"
 
 #ifdef CRASH_DIALOG
 
-#include <glib.h>
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -50,13 +47,12 @@
 #      include <gnu/libc-version.h>
 #endif
 
-#include "intl.h"
 #include "crash.h"
 #include "globals.h"
 #include "browser.h"
 
 /*
- * NOTE: the crash dialog is called when sylpheed is not 
+ * NOTE: the crash dialog is called when ayttm is not 
  * initialized, so do not assume settings are available.
  * for example, loading / creating pixmaps seems not 
  * to be possible.
@@ -133,7 +129,6 @@
  */
 void crash_main(const char *arg) 
 {
-#if CRASH_DIALOG 
        gchar *text;
        gchar **tokens;
        unsigned long pid;
@@ -153,7 +148,6 @@
        g_string_free(output, TRUE);
        g_free(text);
        g_strfreev(tokens);
-#endif /* CRASH_DIALOG */      
 }
 
 /*!
@@ -312,7 +306,7 @@
 
 
 /*!
- *\brief       create debugger script file in sylpheed directory.
+ *\brief       create debugger script file in ayttm directory.
  *             all the other options (creating temp files) looked too 
  *             convoluted.
  */
@@ -338,15 +332,15 @@
 }
 
 /*!
- *\brief       create bug report (goes to Sylpheed Claws bug tracker)  
+ *\brief       create bug report (goes to Ayttm bug tracker)   
  */
 static void crash_create_bug_report(GtkButton *button, const gchar *data)
 {
-       
open_url_nw(NULL,"http://savannah.nongnu.org/bugs/?func=addbug&group=ayttm";);
+       
open_url(NULL,"http://savannah.nongnu.org/bugs/?func=addbug&group=ayttm";);
 }
 
 /*!
- *\brief       launches debugger and attaches it to crashed sylpheed
+ *\brief       launches debugger and attaches it to crashed ayttm
  */
 static void crash_debug(unsigned long crash_pid, 
                        gchar *exe_image,
@@ -366,7 +360,7 @@
                setuid(getuid());
 
                /*
-                * setup debugger to attach to crashed sylpheed
+                * setup debugger to attach to crashed ayttm
                 */
                *argptr++ = "gdb"; 
                *argptr++ = "--nw";
@@ -478,7 +472,7 @@
 
 /*!
  *\brief       see if the crash dialog is allowed (because some
- *             developers may prefer to run sylpheed under gdb...)
+ *             developers may prefer to run ayttm under gdb...)
  */
 static gboolean is_crash_dialog_allowed(void)
 {
@@ -561,4 +555,4 @@
        g_free(filename);
 }
 
-#endif
+#endif /* CRASH_DIALOG */

Index: gtk_eb_html.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/gtk_eb_html.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gtk_eb_html.c       17 Jan 2003 20:16:19 -0000      1.7
+++ gtk_eb_html.c       23 Jan 2003 23:07:21 -0000      1.8
@@ -19,11 +19,8 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include "intl.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
@@ -54,8 +51,6 @@
  * the requested font
  */
 
-#define DEBUG
-
 static int _adjust_font_metrics(int size)
 {
 #ifndef HAVE_LIBXFT
@@ -388,9 +383,9 @@
    if(data && strlen(data) > 1 && strcmp(data, "\n"))
    {
 #ifdef __MINGW32__
-      open_url_nw(widget, data);
+      open_url(widget, data);
 #else
-      open_url_nw(NULL, data);
+      open_url(NULL, data);
 #endif
    }
 }

Index: help_menu.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/src/help_menu.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- help_menu.c 16 Jan 2003 19:39:24 -0000      1.4
+++ help_menu.c 23 Jan 2003 23:07:21 -0000      1.5
@@ -29,11 +29,11 @@
 
 void show_manual()
 {
-  open_url_nw(NULL, "http://staff.ncst.ernet.in/tahir/eb-manual/";);
+  open_url(NULL, "http://staff.ncst.ernet.in/tahir/eb-manual/";);
 }
 
 void show_website()
 {
-  open_url_nw(NULL, "http://www.nongnu.org/ayttm/";);
+  open_url(NULL, "http://www.nongnu.org/ayttm/";);
 }