GNOME.org
 

[pan2/testing] - added key defines for gdk to gtk-compat.h - minor fixes - make dbus optional

commit 72e5b479181e8e283435be8381f1815d392f7688
Author: Heinrich MÃller <henmull src gnome org>
Date:   Fri Dec 23 18:24:31 2011 +0100

    - added key defines for gdk to gtk-compat.h
    - minor fixes
    - make dbus optional

 configure.in                           |   30 +++++++++++++++++-------------
 pan/gui/Makefile.am                    |    2 +-
 pan/gui/actions.cc                     |   12 ++++++------
 pan/gui/body-pane.cc                   |    4 ++--
 pan/gui/e-charset-combo-box.c          |    2 +-
 pan/gui/group-pane.cc                  |    2 +-
 pan/gui/group-prefs-dialog.cc          |    2 +-
 pan/gui/{gtk_compat.h => gtk-compat.h} |   12 ++++++++----
 pan/gui/gui.cc                         |   26 ++++++++++++++------------
 pan/gui/gui.h                          |    6 ++----
 pan/gui/header-pane.cc                 |    4 ++--
 pan/gui/hig.cc                         |    1 -
 pan/gui/pan-ui.h                       |    2 +-
 pan/gui/pan.cc                         |   10 +++++-----
 pan/gui/post-ui.cc                     |    4 ++--
 pan/gui/prefs-ui.cc                    |    2 +-
 pan/gui/save-attach-ui.cc              |    2 +-
 pan/gui/save-ui.cc                     |    2 +-
 pan/gui/score-add-ui.cc                |    2 +-
 pan/gui/score-view-ui.cc               |   14 +++++++-------
 pan/gui/server-ui.cc                   |    2 +-
 21 files changed, 75 insertions(+), 68 deletions(-)
---
diff --git a/configure.in b/configure.in
index 247ef74..3b4721f 100644
--- a/configure.in
+++ b/configure.in
@@ -88,15 +88,9 @@ AM_PATH_GLIB_2_0($GLIB_REQUIRED,,exit 1,gobject gmodule gthread)
 PKG_CHECK_MODULES([GMIME], [ gmime-2.6    >= $GMIME_REQUIRED ], [],
 	[PKG_CHECK_MODULES( [GMIME], [gmime-2.4    >= $GMIME_REQUIRED] )] )
 
-gtk_msg=no
-AC_ARG_WITH(gtk3, AC_HELP_STRING([--with-gtk3], [Enable gtk3 support]), [want_gtk3=$withval], [want_gtk3=no])
-if test "x$want_gtk3" = "xyes" ; then
-	PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK3_REQUIRED],
-	                  [gtk_msg="yes >= $GTK3_REQUIRED"
-	                  AC_DEFINE(HAVE_GTK,[1],[GTK 3.0])]
-	                  )
-else
-    AM_PATH_GTK_2_0($GTK_REQUIRED,,exit 1,gthread)
+AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus], [Enable DBUS support]), [want_dbus=$withval], [want_dbus=yes])
+if test "x$want_dbus" = "xyes" ; then
+  AC_DEFINE(HAVE_DBUS,[1],[DBUS Support for multiple pan instances])],
 fi
 
 gtkspell_msg=no
@@ -109,12 +103,22 @@ if test "x$want_gtkspell" = "xyes" ; then
 	                  AC_MSG_RESULT(no)])
 fi
 
+gtk_msg=no
+AC_ARG_WITH(gtk3, AC_HELP_STRING([--with-gtk3], [Enable gtk3 support]), [want_gtk3=$withval], [want_gtk3=no])
+if test "x$want_gtk3" = "xyes" ; then
+	PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK3_REQUIRED],
+	                  [gtk_msg="yes >= $GTK3_REQUIRED"
+	                  AC_DEFINE(HAVE_GTK,[1],[GTK 3.0])]
+	                  )
+else
+    AM_PATH_GTK_2_0($GTK_REQUIRED,,exit 1,gthread)
+fi
 
 gnutls_msg=no
 AC_ARG_WITH(gnutls, AC_HELP_STRING([--with-gnutls], [Enable GnuTLS support]), [want_gnutls=$withval], [want_gnutls=no])
 if test "x$want_gnutls" = "xyes" ; then
   PKG_CHECK_MODULES([GNUTLS], [gnutls >= $GNUTLS_REQUIRED],
-  [gnutls_msg=yes,
+  [gnutls_msg="yes >= $GNUTLS_REQUIRED"
   AC_DEFINE(HAVE_GNUTLS,[1],[GnuTLS])],
   [gnutls_msg=no
   AC_MSG_RESULT(no)])
@@ -209,9 +213,9 @@ case $host_os in
 esac
 AM_CONDITIONAL([HAVE_WIN32],[test "$win32" = "yes"])
 
-CXXFLAGS="-O0 -g -I/usr/lib/"
-CPPFLAGS="-O0 -g -I/usr/lib/"
-CFLAGS="-g -O0 -I/usr/lib/"
+CXXFLAGS="-g -I/usr/lib/"
+CPPFLAGS="-g -I/usr/lib/"
+CFLAGS="-g -I/usr/lib/"
 
 dnl build the output files
 AC_SUBST(panlocaledir)
diff --git a/pan/gui/Makefile.am b/pan/gui/Makefile.am
index 958374a..9921fc8 100644
--- a/pan/gui/Makefile.am
+++ b/pan/gui/Makefile.am
@@ -51,7 +51,7 @@ noinst_HEADERS = \
  group-pane.h \
  group-prefs.h \
  group-prefs-dialog.h \
- gtk_compat.h \
+ gtk-compat.h \
  gui.h \
  header-pane.h \
  hig.h \
diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc
index 3a9e2ca..60876a2 100644
--- a/pan/gui/actions.cc
+++ b/pan/gui/actions.cc
@@ -146,7 +146,7 @@ namespace
   void do_plonk                        (GtkAction*) { pan_ui->do_plonk(); }
   void do_ignore                       (GtkAction*) { pan_ui->do_ignore(); }
   void do_watch                        (GtkAction*) { pan_ui->do_watch(); }
-  void do_flag_on                      (GtkAction*) { pan_ui->do_flag_on(); }
+  void do_flag                         (GtkAction*) { pan_ui->do_flag(); }
   void do_flag_off                     (GtkAction*) { pan_ui->do_flag_off(); }
   void do_next_flag                    (GtkAction*) { pan_ui->do_next_flag(); }
   void do_last_flag                    (GtkAction*) { pan_ui->do_last_flag(); }
@@ -552,13 +552,13 @@ namespace
       G_CALLBACK(do_ignore) },
 
     { "flag-thread", "ICON_FLAGGED",
-      N_("_Toggle Flag on for Thread"), "X",
-      N_("_Toggle Flag on for Thread"),
-      G_CALLBACK(do_flag_on) },
+      N_("_Toggle Flag on/off for Thread"), "X",
+      N_("_Toggle Flag on/off for Thread"),
+      G_CALLBACK(do_flag) },
 
     { "unflag-thread", NULL,
-      N_("_Toggle Flag off for Thread"), "<shift>X",
-      N_("_Toggle Flag off for Thread"),
+      N_("_Turn Flag off for Thread"), "<shift>X",
+      N_("_Turn Flag off for Thread"),
       G_CALLBACK(do_flag_off) },
 
     { "mark-all-flagged", NULL,
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index 8c27bd9..6209f1b 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -26,7 +26,7 @@ extern "C" {
   #include <glib/gi18n.h>
   #include <gtk/gtk.h>
   #include <gdk/gdk.h>
-  #include <gdk/gdkkeysyms.h>
+  #include "gtk-compat.h"
   #include <gmime/gmime.h>
 }
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -44,7 +44,7 @@ extern "C" {
 #include "tango-colors.h"
 #include "xface.h"
 #include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 #include "save-attach-ui.h"
 
 #define FIRST_PICTURE "first-picture"
diff --git a/pan/gui/e-charset-combo-box.c b/pan/gui/e-charset-combo-box.c
index 2fe1948..42b1d30 100644
--- a/pan/gui/e-charset-combo-box.c
+++ b/pan/gui/e-charset-combo-box.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n.h>
 
 #include "e-charset.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 #define E_CHARSET_COMBO_BOX_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/pan/gui/group-pane.cc b/pan/gui/group-pane.cc
index 777ba43..0b1e563 100644
--- a/pan/gui/group-pane.cc
+++ b/pan/gui/group-pane.cc
@@ -34,7 +34,7 @@ extern "C" {
 #include <pan/data/data.h>
 #include "group-pane.h"
 #include "pad.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 using namespace pan;
 
diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc
index 8b0d364..bb02516 100644
--- a/pan/gui/group-prefs-dialog.cc
+++ b/pan/gui/group-prefs-dialog.cc
@@ -35,7 +35,7 @@ extern "C" {
 #include "hig.h"
 #include "pad.h"
 #include "pan-file-entry.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 using namespace pan;
 
diff --git a/pan/gui/gtk_compat.h b/pan/gui/gtk-compat.h
similarity index 93%
rename from pan/gui/gtk_compat.h
rename to pan/gui/gtk-compat.h
index c4c5b29..45ef459 100644
--- a/pan/gui/gtk_compat.h
+++ b/pan/gui/gtk-compat.h
@@ -1,13 +1,13 @@
 //========================================================================
-/** file	pan/pan/gui/gtk_compat.h
+/** file	pan/pan/gui/gtk-compat.h
  * @author	kid
  * @date
  * 	Created:	Mon 09 May 2011 04:42:46 PM MDT \n
  * 	Last Update:	Mon 09 May 2011 04:42:46 PM MDT
  */
 /*------------------------------------------------------------------------
- * Description:	ÂdescriptionÂ
- * 
+ * Description:	GTK Compatibility layer for GTK2/3+ migration
+ *
  *========================================================================
  */
 
@@ -103,6 +103,10 @@ namespace
   }
 #endif
 #if GTK_CHECK_VERSION(3,0,0)
+
+// include this for conversion of old key names to new
+#include <gdk/gdkkeysyms.h>
+
 #define GTK_OBJECT(w) w
   typedef GtkWidget GtkObject;
 #ifdef GTK_DISABLE_DEPRECATED
@@ -116,5 +120,5 @@ namespace
 #ifdef __cplusplus
 }
 #endif
-  
+
 #endif
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index f97343b..16d772e 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -66,7 +66,7 @@ extern "C" {
 #include "server-ui.h"
 #include "task-pane.h"
 #include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 #include "profiles-dialog.h"
 
@@ -1136,26 +1136,28 @@ void GUI :: do_ignore ()
 }
 
 void
-GUI :: do_flag_on ()
+GUI :: do_flag ()
 {
-  do_flag(true);
+  std::vector<const Article*> v(_header_pane->get_full_selection_v());
+  g_return_if_fail(!v.empty());
+  foreach (std::vector<const Article*>,v,it)
+  {
+    Article* a((Article*)*it);
+    a->set_flag(!a->get_flag());
+  }
+  const Quark& g(_header_pane->get_group());
+  _data.fire_article_flag_changed(v, g);
 }
 
 void
 GUI :: do_flag_off ()
 {
-  do_flag(false);
-}
-
-void
-GUI :: do_flag (bool on)
-{
   std::vector<const Article*> v(_header_pane->get_full_selection_v());
   g_return_if_fail(!v.empty());
   foreach (std::vector<const Article*>,v,it)
   {
     Article* a((Article*)*it);
-    a->set_flag(on);
+    a->set_flag(false);
   }
   const Quark& g(_header_pane->get_group());
   _data.fire_article_flag_changed(v, g);
@@ -1545,7 +1547,7 @@ void GUI :: do_about_pan ()
                                "Calin Culianu <calin ajvar org> - Threaded Decoding",
                                "K. Haley <haleykd users sf net> - Contributor",
                                "Petr Kovar <pknbe volny cz> - Contributor",
-                               "Heinrich M\u00fceller <eddie_v gmx de> - Contributor",
+                               "Heinrich M\u00fcller <eddie_v gmx de> - Contributor",
                                "Christophe Lambin <chris rebelbase com> - Original Pan Development",
                                "Matt Eagleson <matt rebelbase com> - Original Pan Development", 0 };
   GdkPixbuf * logo = gdk_pixbuf_new_from_inline(-1, icon_pan_about_logo, 0, 0);
@@ -1553,7 +1555,7 @@ void GUI :: do_about_pan ()
   gtk_about_dialog_set_program_name (w, _("Pan"));
   gtk_about_dialog_set_version (w, PACKAGE_VERSION);
   gtk_about_dialog_set_comments (w, VERSION_TITLE " (" GIT_REV "; " PLATFORM_INFO ")");
-  gtk_about_dialog_set_copyright (w, _("Copyright \u00A9 2002-2011 Charles Kerr and others")); // \u00A9 is unicode for ï
+  gtk_about_dialog_set_copyright (w, _("Copyright \u00A9 2002-2011 Charles Kerr and others")); // \u00A9 is unicode for (c)
   gtk_about_dialog_set_website (w, "http://pan.rebelbase.com/";);
   gtk_about_dialog_set_logo (w, logo);
   gtk_about_dialog_set_license (w, LICENSE);
diff --git a/pan/gui/gui.h b/pan/gui/gui.h
index 4ceb442..95ca13d 100644
--- a/pan/gui/gui.h
+++ b/pan/gui/gui.h
@@ -33,7 +33,7 @@
 #include <pan/gui/group-prefs.h>
 #include <pan/gui/wait.h>
 
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 namespace pan
 {
@@ -135,7 +135,7 @@ namespace pan
       virtual void do_plonk ();
       virtual void do_watch ();
       virtual void do_ignore ();
-      virtual void do_flag_on ();
+      virtual void do_flag ();
       virtual void do_flag_off ();
       virtual void do_next_flag ();
       virtual void do_last_flag ();
@@ -186,10 +186,8 @@ namespace pan
       void do_show_cert_failed_dialog(VerifyData* data);
       bool confirm_accept_new_cert_dialog(GtkWindow*, gnutls_x509_crt_t, const Quark&);
 #endif
-
       void step_bookmarks(int step);
       void do_read_or_save_articles ();
-      void do_flag(bool);
 
     public:
       static std::string prompt_user_for_save_path (GtkWindow * parent, const Prefs& prefs);
diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc
index bcc6426..1d888b1 100644
--- a/pan/gui/header-pane.cc
+++ b/pan/gui/header-pane.cc
@@ -21,7 +21,7 @@ extern "C" {
   #include <config.h>
   #include <glib/gi18n.h>
   #include <gtk/gtk.h>
-  #include <gdk/gdkkeysyms.h>
+  #include "gtk-compat.h"
   #include <iconv.h>
 }
 #include <cctype>
@@ -42,7 +42,7 @@ extern "C" {
 #include "header-pane.h"
 #include "render-bytes.h"
 #include "tango-colors.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 using namespace pan;
 
diff --git a/pan/gui/hig.cc b/pan/gui/hig.cc
index b0ad223..5ca6381 100644
--- a/pan/gui/hig.cc
+++ b/pan/gui/hig.cc
@@ -137,7 +137,6 @@ HIG :: workarea_add_control (GtkWidget   * table,
                               int           row,
                               GtkWidget   * control)
 {
-  std::cerr<<"table attach "<<table<<" "<<control<<"\n";
   gtk_table_attach (GTK_TABLE(table), control, 3, 4, row, row+1, (GtkAttachOptions)(GTK_EXPAND|GTK_SHRINK|GTK_FILL), (GtkAttachOptions)0, 0, 0);
 }
 
diff --git a/pan/gui/pan-ui.h b/pan/gui/pan-ui.h
index 1921c17..98c4d13 100644
--- a/pan/gui/pan-ui.h
+++ b/pan/gui/pan-ui.h
@@ -66,7 +66,7 @@ namespace pan
     virtual void do_plonk () = 0;
     virtual void do_watch () = 0;
     virtual void do_ignore () = 0;
-    virtual void do_flag_on () = 0;
+    virtual void do_flag () = 0;
     virtual void do_flag_off () = 0;
     virtual void do_next_flag () = 0;
     virtual void do_last_flag () = 0;
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index 013d63c..a0d2e9a 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -544,6 +544,7 @@ _("General Options\n"
 "  --no-gui                 Only show console output, not the download queue.\n") << std::endl;
   }
 
+#ifdef HAVE_DBUS
   /***
    ** DBUS
    ***/
@@ -718,7 +719,7 @@ _("General Options\n"
   /***
    ***
    ***/
-
+#endif
 }
 
 
@@ -817,10 +818,8 @@ main (int argc, char *argv[])
     SocketCreator socket_creator(data, certstore);
     Queue queue (data, data, &socket_creator, certstore, worker_pool, false, 32768);
 
-    ///////////// DBUS
-    /// TODO : make it work with win32
+#ifdef HAVE_DBUS
     Pan pan(data, queue, cache, encode_cache, prefs, group_prefs);
-#ifndef G_OS_WIN32
   #ifndef DEBUG_PARALLEL
     pan_dbus_init(&pan);
 
@@ -916,9 +915,10 @@ main (int argc, char *argv[])
       run_pan_in_window (data, queue, prefs, group_prefs, GTK_WINDOW(window));
     }
 
+#ifdef HAVE_DBUS
     if (pan.dbus_id != -1 ) g_bus_unown_name(pan.dbus_id);
     if (dbus_connection) g_dbus_connection_close(dbus_connection,NULL,0,NULL);
-
+#endif
     for (guint i=0; i<NUM_STATUS_ICONS; ++i)
       g_object_unref(status_icons[i].pixbuf);
     delete _status_icon;
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 2457f6f..8810eb2 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -26,7 +26,7 @@ extern "C" {
   #include <gmime/gmime.h>
   #include <glib/gi18n.h>
   #include <gtk/gtk.h>
-  #include <gdk/gdkkeysyms.h>
+  #include "gtk-compat.h"
   #include <sys/time.h>
 #ifdef HAVE_GTKSPELL
   #include <gtkspell/gtkspell.h>
@@ -53,7 +53,7 @@ extern "C" {
 #include "post.ui.h"
 #include "profiles-dialog.h"
 #include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 #ifdef HAVE_GTKSPELL
 #define DEFAULT_SPELLCHECK_FLAG true
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index 9029ecf..2afe890 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -31,7 +31,7 @@ extern "C" {
 #include "prefs-ui.h"
 #include "tango-colors.h"
 #include "url.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 #include "e-charset-dialog.h"
 
 using namespace pan;
diff --git a/pan/gui/save-attach-ui.cc b/pan/gui/save-attach-ui.cc
index 5145bb7..44b6a40 100644
--- a/pan/gui/save-attach-ui.cc
+++ b/pan/gui/save-attach-ui.cc
@@ -32,7 +32,7 @@ extern "C" {
 #include "pad.h"
 #include "pan-file-entry.h"
 #include "save-attach-ui.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 using namespace pan;
 
diff --git a/pan/gui/save-ui.cc b/pan/gui/save-ui.cc
index 4ae9a49..0ea8dd6 100644
--- a/pan/gui/save-ui.cc
+++ b/pan/gui/save-ui.cc
@@ -32,7 +32,7 @@ extern "C" {
 #include "pad.h"
 #include "pan-file-entry.h"
 #include "save-ui.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 using namespace pan;
 
diff --git a/pan/gui/score-add-ui.cc b/pan/gui/score-add-ui.cc
index f5810b6..56606de 100644
--- a/pan/gui/score-add-ui.cc
+++ b/pan/gui/score-add-ui.cc
@@ -29,7 +29,7 @@ extern "C" {
 #include "pad.h"
 #include "score-add-ui.h"
 #include "score-view-ui.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 using namespace pan;
 
diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc
index 6bc1974..d4ab4af 100644
--- a/pan/gui/score-view-ui.cc
+++ b/pan/gui/score-view-ui.cc
@@ -26,19 +26,19 @@ extern "C" {
 #include "pad.h"
 #include "score-add-ui.h"
 #include "score-view-ui.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 using namespace pan;
 
 namespace
 {
-  void                                          
+  void
   response_cb (GtkDialog * dialog, int response, gpointer data)
   {
     if (response == GTK_RESPONSE_APPLY)
       static_cast<Data*>(data)->rescore ();
 
-    gtk_widget_destroy (GTK_WIDGET(dialog));     
+    gtk_widget_destroy (GTK_WIDGET(dialog));
   }
 
   enum
@@ -55,13 +55,13 @@ namespace
     GtkWidget * button = gtk_button_new ();
     GtkWidget * label = gtk_label_new_with_mnemonic (_("Close and Re_score"));
     gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
-			      
+
     GtkWidget * image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON);
     GtkWidget * image2 = gtk_image_new_from_stock (GTK_STOCK_REFRESH, GTK_ICON_SIZE_BUTTON);
     GtkWidget * hbox = gtk_hbox_new (FALSE, 2);
 
     GtkWidget * align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-					        
+
     gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
     gtk_box_pack_start (GTK_BOX (hbox), image2, FALSE, FALSE, 0);
     gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -167,7 +167,7 @@ ScoreView :: tree_view_refresh ()
                                        COLUMN_DATA, i, // index into _items
                                        -1);
 
-    // cleanup 
+    // cleanup
     g_string_free (criteria, TRUE);
   }
 }
@@ -185,7 +185,7 @@ ScoreView :: ScoreView (Data& data, GtkWindow* parent,
 	                                               GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
 	                                               NULL);
   GtkWidget * button = create_rescore_button ();
-  gtk_widget_show (button); 
+  gtk_widget_show (button);
   gtk_dialog_add_action_widget (GTK_DIALOG(w), button, GTK_RESPONSE_APPLY);
   gtk_window_set_resizable (GTK_WINDOW(w), true);
   g_signal_connect (GTK_OBJECT(w), "response", G_CALLBACK(response_cb), &data);
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index 134117a..9c90fd9 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -36,7 +36,7 @@ extern "C" {
 #include "server-ui.h"
 #include "pad.h"
 #include "hig.h"
-#include "gtk_compat.h"
+#include "gtk-compat.h"
 
 #ifdef HAVE_GNUTLS
   #include <pan/data/cert-store.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]