Merge lp:~cimi/overlay-scrollbar/new_0_2_series into lp:overlay-scrollbar

[Andrea Cimitan]

[lp:~cimi/overlay-scrollbar/new_0_2_series]

237. By Andrea Cimitan on 2011-05-17

Fix qgtkstyle

[Ted Gould (ted)]

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2011-05-12 11:31:54 +0000
+++ configure.ac	2011-05-17 21:46:25 +0000
@@ -2,7 +2,7 @@
 
 # Package
 
-AC_INIT([overlay-scrollbar],[0.1.12.1],[https://bugs.launchpad.net/ayatana-scrollbar],[overlay-scrollbar])
+AC_INIT([overlay-scrollbar],[0.2.0.1],[https://bugs.launchpad.net/ayatana-scrollbar],[overlay-scrollbar])
 AC_CONFIG_SRCDIR([os/os-scrollbar.h])
 AC_CONFIG_MACRO_DIR([build])
 AC_CONFIG_AUX_DIR([build])
@@ -18,7 +18,7 @@
 # - interfaces added -> increment AGE
 # - interfaces removed -> AGE = 0
 OS_LT_CURRENT=0
-OS_LT_REV=12
+OS_LT_REV=0
 OS_LT_AGE=0
 OS_LT_VERSION="$OS_LT_CURRENT:$OS_LT_REV:$OS_LT_AGE"
 OS_LT_LDFLAGS="-version-info $OS_LT_VERSION"
 
=== modified file 'os/os-scrollbar.c'
--- os/os-scrollbar.c	2011-05-17 17:20:52 +0000
+++ os/os-scrollbar.c	2011-05-17 21:46:25 +0000
@@ -93,6 +93,7 @@
 static void os_scrollbar_realize (GtkWidget *widget);
 static void os_scrollbar_show (GtkWidget *widget);
 static void os_scrollbar_size_allocate (GtkWidget *widget, GdkRectangle *allocation);
+static void os_scrollbar_size_request (GtkWidget *widget, GtkRequisition *requisition);
 static void os_scrollbar_unmap (GtkWidget *widget);
 static void os_scrollbar_unrealize (GtkWidget *widget);
 static void os_scrollbar_dispose (GObject *object);
@@ -1672,6 +1673,7 @@
   widget_class->realize       = os_scrollbar_realize;
   widget_class->show          = os_scrollbar_show;
   widget_class->size_allocate = os_scrollbar_size_allocate;
+  widget_class->size_request  = os_scrollbar_size_request;
   widget_class->unmap         = os_scrollbar_unmap;
   widget_class->unrealize     = os_scrollbar_unrealize;
 
@@ -1968,6 +1970,24 @@
 }
 
 static void
+os_scrollbar_size_request (GtkWidget      *widget,
+                           GtkRequisition *requisition)
+{
+  OsScrollbar *scrollbar;
+  OsScrollbarPrivate *priv;
+
+  scrollbar = OS_SCROLLBAR (widget);
+  priv = scrollbar->priv;
+
+  if (priv->orientation == GTK_ORIENTATION_VERTICAL)
+    requisition->width = 0;
+  else
+    requisition->height = 0;
+
+  widget->requisition = *requisition;
+}
+
+static void
 os_scrollbar_unmap (GtkWidget *widget)
 {
   OsScrollbar *scrollbar;
 
=== modified file 'os/os-utils.c'
--- os/os-utils.c	2011-04-26 22:33:59 +0000
+++ os/os-utils.c	2011-05-17 21:46:25 +0000
@@ -34,7 +34,6 @@
   /* Black-list of program names retrieved with g_get_prgname(). */
   static const gchar *const blacklist[] = {
     "apport-gtk",
-    "Banshee",
     "codeblocks",
     "codelite",
     "eclipse",
@@ -48,9 +47,19 @@
     "vmware"
   };
 
+  GModule *module;
+  gpointer func;
   gint32 i;
   const gint32 nr_programs = G_N_ELEMENTS (blacklist);
 
+  module = g_module_open (NULL, 0);
+  if (g_module_symbol (module, "qt_startup_hook", &func))
+    {
+      g_module_close (module);
+      return TRUE;
+    }
+  g_module_close (module);
+
   /* Black list RTL languages, not supported yet */
   if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
     return TRUE;