Author: olivier
Date: 2009-02-07 17:30:37 +0000 (Sat, 07 Feb 2009)
New Revision: 29463
Modified:
libxfcegui4/trunk/configure.in.in
libxfcegui4/trunk/libxfce4kbd-private/Makefile.am
libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c
libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.h
Log:
Add parent parameter to xfce_shortcut_dialog_run() to fix the transient
mode. This breaks the API/ABI, thus adding a separate library version
for libxfce4kbd-private which his higher than the one before.
Modified: libxfcegui4/trunk/configure.in.in
===================================================================
--- libxfcegui4/trunk/configure.in.in 2009-02-07 16:40:40 UTC (rev 29462)
+++ libxfcegui4/trunk/configure.in.in 2009-02-07 17:30:37 UTC (rev 29463)
@@ -8,6 +8,7 @@
dnl *** Version information ***
dnl ***************************
m4_define([libxfcegui4_verinfo], [7:0:3])
+m4_define([libxfce4kbd_private_verinfo], [5:0:0])
m4_define([libxfcegui4_version_major], [4])
m4_define([libxfcegui4_version_minor], [5])
m4_define([libxfcegui4_version_micro], [99])
@@ -49,6 +50,11 @@
LIBXFCEGUI4_VERINFO=libxfcegui4_verinfo()
AC_SUBST([LIBXFCEGUI4_VERINFO])
+dnl ***************************************************
+dnl *** Libtool versioning from libxfce4kbd-private ***
+dnl ***************************************************
+LIBXFCE4KBD_PRIVATE_VERINFO=libxfce4kbd_private_verinfo()
+AC_SUBST([LIBXFCE4KBD_PRIVATE_VERINFO])
dnl *********************************
dnl *** Subst libxfcegui4 version ***
Modified: libxfcegui4/trunk/libxfce4kbd-private/Makefile.am
===================================================================
--- libxfcegui4/trunk/libxfce4kbd-private/Makefile.am 2009-02-07 16:40:40 UTC
(rev 29462)
+++ libxfcegui4/trunk/libxfce4kbd-private/Makefile.am 2009-02-07 17:30:37 UTC
(rev 29463)
@@ -42,7 +42,7 @@
libxfce4kbd_private_la_LDFLAGS = \
-export-dynamic \
- -version-info $(LIBXFCEGUI4_VERINFO) \
+ -version-info $(LIBXFCE4KBD_PRIVATE_VERINFO) \
-export-symbols-regex "^[^_].*" \
-no-undefined \
$(LIBX11_LDFLAGS)
Modified: libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c
===================================================================
--- libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c
2009-02-07 16:40:40 UTC (rev 29462)
+++ libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.c
2009-02-07 17:30:37 UTC (rev 29463)
@@ -317,14 +317,14 @@
gint
-xfce_shortcut_dialog_run (XfceShortcutDialog *dialog)
+xfce_shortcut_dialog_run (XfceShortcutDialog *dialog,
+ GtkWidget *parent)
{
gint response = GTK_RESPONSE_CANCEL;
-
+
g_return_val_if_fail (XFCE_IS_SHORTCUT_DIALOG (dialog), GTK_RESPONSE_CANCEL);
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW
(gtk_widget_get_toplevel (GTK_WIDGET (dialog))));
- gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+ gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
/* Take control on the keyboard */
Modified: libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.h
===================================================================
--- libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.h
2009-02-07 16:40:40 UTC (rev 29462)
+++ libxfcegui4/trunk/libxfce4kbd-private/xfce-shortcut-dialog.h
2009-02-07 17:30:37 UTC (rev 29463)
@@ -42,7 +42,8 @@
GtkWidget *xfce_shortcut_dialog_new (const gchar
*provider,
const gchar
*action_name,
const gchar *action)
G_GNUC_MALLOC;
-gint xfce_shortcut_dialog_run (XfceShortcutDialog *dialog);
+gint xfce_shortcut_dialog_run (XfceShortcutDialog *dialog,
+ GtkWidget *parent);
const gchar *xfce_shortcut_dialog_get_shortcut (XfceShortcutDialog *dialog);
const gchar *xfce_shortcut_dialog_get_action (XfceShortcutDialog *action);
const gchar *xfce_shortcut_dialog_get_action_name (XfceShortcutDialog *action);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
