Package: pan / 0.146-2

rm-windows-mac-entries Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
Description: Removes Mac OS X and Windows stuff from the preferences GUI
Forwarded: NA
Author: Mario Iseli <admin@marioiseli.com>
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -599,10 +599,8 @@
     // build the combo box...
     const std::string mode (prefs.get_string (mode_key, mode_fallback));
     GtkListStore * store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
-    const char* strings[5][2] = { { N_("Use GNOME Preferences"), "gnome" },
+    const char* strings[3][2] = { { N_("Use GNOME Preferences"), "gnome" },
                                   { N_("Use KDE Preferences"), "kde" },
-                                  { N_("Use OS X Preferences"), "mac" },
-                                  { N_("Use Windows Preferences"), "windows" },
                                   { N_("Custom Command:"), "custom" } };
     int sel_index (0);
     for (size_t i=0; i<G_N_ELEMENTS(strings); ++i) {
--- a/pan/gui/url.cc
+++ b/pan/gui/url.cc
@@ -29,21 +29,15 @@
 
 using namespace pan;
 
-// possible values: "gnome", "kde", "mac", "windows", "custom"
+// possible values: "gnome", "kde", "custom"
 const char*
 URL :: get_environment ()
 {
   const char * mode ("custom");
-#if defined(G_OS_WIN32)
-  mode = "windows";
-#elif defined(G_OS_DARWIN)
-  mode = "mac";
-#else // not mac or windows
   if (g_getenv ("GNOME_DESKTOP_SESSION_ID"))
     mode = "gnome";
   else if (g_getenv ("KDE_FULL_SESSION"))
     mode = "kde";
-#endif
   return mode;
 }