[Goodies-commits] r1882 - in xfce4-clipman-plugin/trunk: . panel-plugin

[Nick Schermer]

Author: nick
Date: 2006-08-11 06:30:04 +0000 (Fri, 11 Aug 2006)
New Revision: 1882

Modified:
   xfce4-clipman-plugin/trunk/configure.in.in
   xfce4-clipman-plugin/trunk/panel-plugin/clipman-dialogs.c
Log:
* Depend on xfce4-panel rev 22703, libxfcegui4 4.3.90.2 and
  libxfce4util 4.3.90.2
* Remove the old header code for < 4.3.90.2


Modified: xfce4-clipman-plugin/trunk/configure.in.in
===================================================================
--- xfce4-clipman-plugin/trunk/configure.in.in	2006-08-11 06:27:35 UTC (rev 1881)
+++ xfce4-clipman-plugin/trunk/configure.in.in	2006-08-11 06:30:04 UTC (rev 1882)
@@ -34,18 +34,10 @@
 dnl required
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90.2])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.90.2])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90.2svn-22703])
 
-AC_MSG_CHECKING([whether to use new header dialog])
-if $PKG_CONFIG --atleast-version 4.3.90.2 libxfcegui4-1.0 >/dev/null 2>&1; then
-  AC_DEFINE([USE_NEW_DIALOG], [1], [Define to use new header dialog])
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
-
 dnl Check for i18n support
 XDT_I18N([@LINGUAS@])
 

Modified: xfce4-clipman-plugin/trunk/panel-plugin/clipman-dialogs.c
===================================================================
--- xfce4-clipman-plugin/trunk/panel-plugin/clipman-dialogs.c	2006-08-11 06:27:35 UTC (rev 1881)
+++ xfce4-clipman-plugin/trunk/panel-plugin/clipman-dialogs.c	2006-08-11 06:30:04 UTC (rev 1882)
@@ -149,7 +149,6 @@
     
     xfce_panel_plugin_block_menu (clipman->plugin);
     
-#ifdef USE_NEW_DIALOG
     dialog = xfce_titled_dialog_new_with_buttons (_("Clipboard Manager"),
                                                   GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
                                                   GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
@@ -157,13 +156,6 @@
                                                   NULL);
 /*    xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog),
                                      _("Configure the clipboard manager plugin")); */
-#else    
-    dialog = gtk_dialog_new_with_buttons (_("Properties"), 
-        GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
-        GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
-        GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
-        NULL);
-#endif
 
     gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER);
     gtk_window_set_icon_name (GTK_WINDOW (dialog), "xfce4-settings");
@@ -172,13 +164,6 @@
     
     dialog_vbox = GTK_DIALOG (dialog)->vbox;
 
-#ifndef USE_NEW_DIALOG
-    frame = xfce_create_header (NULL, _("Clipboard Manager"));
-    gtk_widget_set_size_request (GTK_BIN (frame)->child, -1, 32);
-    gtk_container_set_border_width (GTK_CONTAINER (frame), BORDER-3);
-    gtk_box_pack_start (GTK_BOX (dialog_vbox), frame, FALSE, TRUE, 0);
-#endif
-
     notebook = gtk_notebook_new ();
     gtk_box_pack_start (GTK_BOX (dialog_vbox), notebook, FALSE, TRUE, 0);
     gtk_container_set_border_width (GTK_CONTAINER (notebook), BORDER-3);