This is an automated email from the git hooks/post-receive script.
isaacschemm pushed a commit to branch isaacschemm/gtk3
in repository panel-plugins/xfce4-verve-plugin.
commit 342019633743ccd22d73952bfd39e07b9090f34e
Author: Isaac Schemm <isaacsch...@gmail.com>
Date: Sun Jul 3 16:28:06 2016 -0500
Port to GTK3
---
configure.ac.in | 6 ++----
panel-plugin/Makefile.am | 4 ----
panel-plugin/verve-plugin.c | 20 ++++++++++----------
panel-plugin/xfce4-verve-plugin.desktop.in | 1 +
po/POTFILES.in | 1 -
5 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index f70e2ce..a99076c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -53,10 +53,8 @@ XDT_I18N([@LINGUAS@])
dnl ***********************************
dnl *** Check for required packages ***
dnl ***********************************
-XDT_CHECK_PACKAGE([LIBEXO], [exo-1], [0.5.0])
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.12.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.4])
XDT_CHECK_PACKAGE([LIBPCRE], [libpcre], [5.0])
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 55067ef..cbc5bd5 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -15,18 +15,14 @@ libverve_la_CFLAGS =
\
-I$(top_builddir) \
-I$(top_srcdir) \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- @LIBEXO_CFLAGS@ \
@LIBXFCE4PANEL_CFLAGS@ \
@LIBXFCE4UI_CFLAGS@ \
- @LIBXFCE4UTIL_CFLAGS@ \
@LIBPCRE_CFLAGS@ \
@GTHREAD_CFLAGS@
libverve_la_LIBADD = \
- @LIBEXO_LIBS@ \
@LIBXFCE4PANEL_LIBS@ \
@LIBXFCE4UI_LIBS@ \
- @LIBXFCE4UTIL_LIBS@ \
@LIBPCRE_LIBS@ \
@GTHREAD_LIBS@
diff --git a/panel-plugin/verve-plugin.c b/panel-plugin/verve-plugin.c
index c6447bf..90a829f 100644
--- a/panel-plugin/verve-plugin.c
+++ b/panel-plugin/verve-plugin.c
@@ -211,7 +211,7 @@ verve_plugin_buttonpress_cb (GtkWidget *entry,
verve_plugin_focus_timeout_reset (verve);
/* Grab entry focus if possible */
- if (event->button != 3 && toplevel && toplevel->window &&
!GTK_WIDGET_HAS_FOCUS(entry))
+ if (event->button != 3 && toplevel && gtk_widget_get_window(toplevel) &&
!gtk_widget_has_focus(entry))
xfce_panel_plugin_focus_widget (verve->plugin, entry);
return FALSE;
@@ -276,12 +276,12 @@ verve_plugin_keypress_cb (GtkWidget *entry,
switch (event->keyval)
{
/* Reset entry value when ESC is pressed */
- case GDK_Escape:
+ case GDK_KEY_Escape:
gtk_entry_set_text (GTK_ENTRY (entry), "");
return TRUE;
/* Browse backwards through the command history */
- case GDK_Down:
+ case GDK_KEY_Down:
/* Do nothing if history is empty */
if (verve_history_is_empty ())
return TRUE;
@@ -322,7 +322,7 @@ verve_plugin_keypress_cb (GtkWidget *entry,
return TRUE;
/* Browse forwards through the command history */
- case GDK_Up:
+ case GDK_KEY_Up:
/* Do nothing if the history is empty */
if (verve_history_is_empty ())
return TRUE;
@@ -363,8 +363,8 @@ verve_plugin_keypress_cb (GtkWidget *entry,
return TRUE;
/* Execute command entered by the user */
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
/* Retrieve a copy of the entry text */
command = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
@@ -421,7 +421,7 @@ verve_plugin_keypress_cb (GtkWidget *entry,
return TRUE;
/* Cycle through completion results */
- case GDK_Tab:
+ case GDK_KEY_Tab:
/* Retrieve a copy of the entry text */
command = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
@@ -1003,7 +1003,7 @@ verve_plugin_properties (XfcePanelPlugin *plugin,
GtkWidget *label_box;
GtkWidget *history_length_label;
GtkWidget *history_length_spin;
- GtkObject *adjustment;
+ GObject *adjustment;
GtkWidget *bin3;
GtkWidget *alignment;
@@ -1030,7 +1030,7 @@ verve_plugin_properties (XfcePanelPlugin *plugin,
/* Create properties dialog */
dialog = xfce_titled_dialog_new_with_buttons (_("Verve"),
GTK_WINDOW
(gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
- GTK_DIALOG_DESTROY_WITH_PARENT
| GTK_DIALOG_NO_SEPARATOR,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CLOSE,
GTK_RESPONSE_OK,
NULL);
@@ -1047,7 +1047,7 @@ verve_plugin_properties (XfcePanelPlugin *plugin,
/* Notebook setup */
notebook = gtk_notebook_new ();
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), notebook, TRUE,
TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG
(dialog))), notebook, TRUE, TRUE, 0);
gtk_widget_show (notebook);
general_vbox = gtk_vbox_new (FALSE, 8);
diff --git a/panel-plugin/xfce4-verve-plugin.desktop.in
b/panel-plugin/xfce4-verve-plugin.desktop.in
index d7efc97..d58ef39 100644
--- a/panel-plugin/xfce4-verve-plugin.desktop.in
+++ b/panel-plugin/xfce4-verve-plugin.desktop.in
@@ -6,3 +6,4 @@ _Comment=Command line interface with auto-completion and
command history
Icon=utilities-terminal
X-XFCE-Internal=FALSE
X-XFCE-Module=verve
+X-XFCE-API=2.0
diff --git a/po/POTFILES.in b/po/POTFILES.in
index edcbe0c..fefed61 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,4 +6,3 @@ panel-plugin/verve-history.h
panel-plugin/verve-history.c
panel-plugin/verve-plugin.c
panel-plugin/xfce4-verve-plugin.desktop.in
-scripts/verve-focus.c
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
