[Xfce4-commits] [xfce/exo] branch master updated (1b758e4 -> b987c42)
This is an automated email from the git hooks/post-receive script. bluesabre pushed a change to branch master in repository xfce/exo. from 1b758e4 Updates for release new b987c42 Post release updates The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: configure.ac.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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
[Xfce4-commits] [xfce/exo] 01/01: Post release updates
This is an automated email from the git hooks/post-receive script. bluesabre pushed a commit to branch master in repository xfce/exo. commit b987c4241a71798d2dec0ead13bbcd944a65a181 Author: Sean Davis Date: Mon Oct 31 21:38:55 2016 -0400 Post release updates --- configure.ac.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 84676ff..e228c23 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -15,7 +15,7 @@ m4_define([libexo_version_minor], [11]) m4_define([libexo_version_micro], [2]) m4_define([libexo_version_nano], []) m4_define([libexo_version_build], [@REVISION@]) -m4_define([libexo_version_tag], []) +m4_define([libexo_version_tag], [git]) m4_define([libexo_version], [libexo_version_major().libexo_version_minor().libexo_version_micro()ifelse(libexo_version_nano(), [], [], [.libexo_version_nano()])ifelse(libexo_version_tag(), [git], [libexo_version_tag()-libexo_version_build()], [libexo_version_tag()])]) dnl -- 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
[Xfce4-commits] [xfce/exo] branch master updated (fea2619 -> 1b758e4)
This is an automated email from the git hooks/post-receive script. bluesabre pushed a change to branch master in repository xfce/exo. from fea2619 Probable fix for Thunar detailed view (Xfce #12916) new 1b758e4 Updates for release The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: NEWS| 13 + configure.ac.in | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) -- 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
[Xfce4-commits] [xfce/exo] annotated tag exo-0.11.2 created (now 7e5c563)
This is an automated email from the git hooks/post-receive script. bluesabre pushed a change to annotated tag exo-0.11.2 in repository xfce/exo. at 7e5c563 (tag) tagging 1b758e4628c24f3c9280905f5ebda9bfbb6da3e9 (commit) replaces exo-0.11.1 tagged by Sean Davis on Mon Oct 31 21:35:05 2016 -0400 - Log - exo-0.11.2 --- No new revisions were added by this update. -- 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
[Xfce4-commits] [xfce/exo] 01/01: Updates for release
This is an automated email from the git hooks/post-receive script. bluesabre pushed a commit to branch master in repository xfce/exo. commit 1b758e4628c24f3c9280905f5ebda9bfbb6da3e9 Author: Sean Davis Date: Mon Oct 31 21:34:19 2016 -0400 Updates for release --- NEWS| 13 + configure.ac.in | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 17de401..8036335 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +0.11.2 (Development Release) +== +- Several improvements from f2404: + - Remove unused struct member + - Check index range before accessing array + - Do not assign value twice + - Resolve gdk_cursor_* deprecated warnings + - Resolve gdk_threads_* deprecated warnings +- Fixed vertical alignment of options in preferred applications +- Fixed issue with Thunar detailed view losing selection (Xfce #12916) +- Translation updates: Asturian, English (Australia), Italian, Kazakh, + Lithuanian, Malay, Polish, Portuguese, Romanian, Russian, Thai + 0.11.1 (Development Release) == - This release addresses a new bug introduced in 0.11.0 where exo diff --git a/configure.ac.in b/configure.ac.in index 8b98c84..84676ff 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -12,10 +12,10 @@ m4_define([libexo_verinfo], [1:0:1]) m4_define([libexo_version_api], [1]) m4_define([libexo_version_major], [0]) m4_define([libexo_version_minor], [11]) -m4_define([libexo_version_micro], [1]) +m4_define([libexo_version_micro], [2]) m4_define([libexo_version_nano], []) m4_define([libexo_version_build], [@REVISION@]) -m4_define([libexo_version_tag], [git]) +m4_define([libexo_version_tag], []) m4_define([libexo_version], [libexo_version_major().libexo_version_minor().libexo_version_micro()ifelse(libexo_version_nano(), [], [], [.libexo_version_nano()])ifelse(libexo_version_tag(), [git], [libexo_version_tag()-libexo_version_build()], [libexo_version_tag()])]) dnl -- 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
[Xfce4-commits] [apps/xfce4-dict] 16/43: Replace gtk_widget_modify_font by gtk_widget_override_font/GtkStyleContext
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 72c62723f960e21dde4c2401bd09d02164fec4fc
Author: Andre Miranda
Date: Wed Jul 20 23:05:35 2016 -0300
Replace gtk_widget_modify_font by gtk_widget_override_font/GtkStyleContext
---
lib/speedreader.c | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/lib/speedreader.c b/lib/speedreader.c
index 025845d..f9b5e27 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -354,7 +354,6 @@ static void sr_start(XfdSpeedReader *dialog)
gint wpm, grouping;
gint interval;
const gchar *fontname;
- PangoFontDescription *pfd;
gchar *text, *cleaned_text;
GtkTextIter start, end;
@@ -380,9 +379,25 @@ static void sr_start(XfdSpeedReader *dialog)
/* set the font */
fontname =
gtk_font_button_get_font_name(GTK_FONT_BUTTON(priv->button_font));
+
+#if GTK_CHECK_VERSION (3, 16, 0)
+ gchar *css;
+ GtkCssProvider *provider;
+
+ css = g_strdup_printf("* { font: %s; }", fontname);
+ provider = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (provider, css, -1, NULL);
+ gtk_style_context_add_provider (
+ GTK_STYLE_CONTEXT (gtk_widget_get_style_context
(GTK_WIDGET (priv->display_label))),
+ GTK_STYLE_PROVIDER(provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ g_free(css);
+#else
+ PangoFontDescription *pfd;
pfd = pango_font_description_from_string(fontname);
- gtk_widget_modify_font(priv->display_label, pfd);
+ gtk_widget_override_font(datetime->time_label, pfd);
pango_font_description_free(pfd);
+#endif
/* word grouping */
grouping =
gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(priv->spin_grouping));
--
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
[Xfce4-commits] [apps/xfce4-dict] 19/43: Replace gdk_cursor_new by gdk_cursor_new_from_name
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit d33c20a7a1261adfbf3941150e9424117073c443
Author: Andre Miranda
Date: Wed Jul 20 23:10:25 2016 -0300
Replace gdk_cursor_new by gdk_cursor_new_from_name
---
lib/gui.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index 1bf69e7..f884cab 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -898,8 +898,8 @@ void dict_gui_create_main_window(DictData *dd)
/* support for links (cross-references) for dictd responses */
{
- hand_cursor = gdk_cursor_new(GDK_HAND2);
- regular_cursor = gdk_cursor_new(GDK_XTERM);
+ hand_cursor =
gdk_cursor_new_from_name(gdk_display_get_default(), "pointer");
+ regular_cursor =
gdk_cursor_new_from_name(gdk_display_get_default(), "default");
g_signal_connect(dd->main_textview, "key-press-event",
G_CALLBACK(textview_key_press_event), dd);
--
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
[Xfce4-commits] [apps/xfce4-dict] 37/43: Use GtkSearchEntry instead of GtkEntry
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 46003330d4ca32b56f234e436d57c8306a8a17da
Author: Andre Miranda
Date: Sat Oct 22 14:13:10 2016 -0300
Use GtkSearchEntry instead of GtkEntry
---
panel-plugin/xfce4-dict-plugin.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index b38b192..e12ef6e 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -391,10 +391,10 @@ static void dict_plugin_construct(XfcePanelPlugin *plugin)
g_signal_connect(dpd->dd->pref_menu_item, "activate",
G_CALLBACK(dict_plugin_properties_dialog), dpd);
/* panel entry */
- dpd->dd->panel_entry = gtk_entry_new();
+ dpd->dd->panel_entry = gtk_search_entry_new();
gtk_entry_set_icon_from_icon_name(GTK_ENTRY(dpd->dd->panel_entry),
GTK_ENTRY_ICON_SECONDARY, "gtk-clear");
gtk_entry_set_width_chars(GTK_ENTRY(dpd->dd->panel_entry), 25);
- gtk_entry_set_text(GTK_ENTRY(dpd->dd->panel_entry), _("Search term"));
+ gtk_entry_set_placeholder_text(GTK_ENTRY(dpd->dd->panel_entry),
_("Search term"));
g_signal_connect(dpd->dd->panel_entry, "icon-release",
G_CALLBACK(entry_icon_release_cb), dpd);
g_signal_connect(dpd->dd->panel_entry, "activate",
G_CALLBACK(entry_activate_cb), dpd);
g_signal_connect(dpd->dd->panel_entry, "button-press-event",
G_CALLBACK(entry_buttonpress_cb), dpd);
--
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
[Xfce4-commits] [apps/xfce4-dict] 09/43: Remove compat code for panel < 4.9 and GTK <=2
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 4d8aa2bab2d04b8ff16150cc7bfbe719653922ab
Author: Andre Miranda
Date: Wed Jul 20 22:40:45 2016 -0300
Remove compat code for panel < 4.9 and GTK <=2
---
lib/gui.c| 8 +--
panel-plugin/xfce4-dict-plugin.c | 51
2 files changed, 1 insertion(+), 58 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index 2f44c54..1c826e1 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -897,10 +897,8 @@ void dict_gui_create_main_window(DictData *dd)
G_CALLBACK(textview_populate_popup_cb), dd);
}
/* tooltips */
-#if GTK_CHECK_VERSION(2, 12, 0)
gtk_widget_set_has_tooltip(dd->main_textview, TRUE);
g_signal_connect(dd->main_textview, "query-tooltip",
G_CALLBACK(textview_query_tooltip_cb), dd);
-#endif
gtk_widget_show(dd->main_textview);
gtk_container_add(GTK_CONTAINER(scrolledwindow_results),
dd->main_textview);
@@ -966,11 +964,7 @@ void dict_gui_about_dialog(GtkWidget *widget, DictData *dd)
"translator-credits", _("translator-credits"),
"license", XFCE_LICENSE_GPL,
"version", PACKAGE_VERSION,
-#if GTK_CHECK_VERSION(2,11,0)
- "program-name", title,
-#else
- "name", title,
-#endif
+ "program-name", _("Xfce4 Dictionary"),
NULL);
if (logo != NULL)
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index 3fe6457..6ba3cee 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -80,10 +80,7 @@ static gboolean dict_plugin_panel_set_size(XfcePanelPlugin
*plugin, gint wsize,
{
gint size;
gint bsize = wsize;
-
-#if defined(LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION(4,9,0)
bsize /= xfce_panel_plugin_get_nrows(plugin);
-#endif
size = bsize - 2 - (2 * MAX(dpd->panel_button->style->xthickness,
dpd->panel_button->style->ythickness));
@@ -92,7 +89,6 @@ static gboolean dict_plugin_panel_set_size(XfcePanelPlugin
*plugin, gint wsize,
gtk_image_set_from_pixbuf(GTK_IMAGE(dpd->panel_button_image),
dpd->dd->icon);
-#if defined(LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION(4,9,0)
if (dpd->dd->show_panel_entry &&
xfce_panel_plugin_get_mode(dpd->plugin) !=
XFCE_PANEL_PLUGIN_MODE_VERTICAL)
{
@@ -109,16 +105,6 @@ static gboolean dict_plugin_panel_set_size(XfcePanelPlugin
*plugin, gint wsize,
gtk_widget_hide(dpd->dd->panel_entry);
xfce_panel_plugin_set_small(plugin, TRUE);
}
-#else
- if (dpd->dd->show_panel_entry &&
- xfce_panel_plugin_get_orientation(plugin) ==
GTK_ORIENTATION_HORIZONTAL)
- {
- gtk_widget_show(dpd->dd->panel_entry);
- gtk_widget_set_size_request(dpd->dd->panel_entry,
dpd->dd->panel_entry_size, -1);
- }
- else
- gtk_widget_hide(dpd->dd->panel_entry);
-#endif
gtk_widget_set_size_request(dpd->panel_button, bsize, bsize);
@@ -126,30 +112,6 @@ static gboolean dict_plugin_panel_set_size(XfcePanelPlugin
*plugin, gint wsize,
}
-/* TODO remove me, unused
-static void dict_toggle_main_window(GtkWidget *button, DictData *dd)
-{
- if (GTK_WIDGET_VISIBLE(dd->window))
- gtk_widget_hide(dd->window);
- else
- {
- const gchar *panel_text = "";
-
- if (dd->panel_entry != NULL)
- panel_text =
gtk_entry_get_text(GTK_ENTRY(dd->panel_entry));
-
- dict_show_main_window(dd);
- if (NZV(panel_text))
- {
- dict_search_word(dd, panel_text);
- gtk_entry_set_text(GTK_ENTRY(dd->main_entry),
panel_text);
- }
- gtk_widget_grab_focus(dd->main_entry);
- }
-}
-*/
-
-
static void dict_plugin_panel_button_clicked(GtkWidget *button, DictPanelData
*dpd)
{
if (GTK_WIDGET_VISIBLE(dpd->dd->window))
@@ -272,21 +234,12 @@ static void dict_plugin_free_data(XfcePanelPlugin
*plugin, DictPanelData *dpd)
}
-#if defined(LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION(4,9,0)
static void dict_plugin_panel_change_mode(XfcePanelPlugin *plugin,
XfcePanelPluginMode mode, DictPanelData *dpd)
{
dict_plugin_panel_set_size(plugin, xfce_panel_plugin_get_size(plugin),
dpd);
}
-#else
-static void dict_plugin_panel_change_orientation(XfcePanelPlugin *plugin,
-
GtkOrientation orientation,
[Xfce4-commits] [apps/xfce4-dict] 08/43: Replace GtkStock by GtkImage
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 264ed9b93372b572b002079c2a2ec03f0c2ff368
Author: Andre Miranda
Date: Wed Jul 20 22:28:33 2016 -0300
Replace GtkStock by GtkImage
---
lib/dictd.c | 2 +-
lib/gui.c| 6 +++---
lib/prefs.c | 12 +--
lib/speedreader.c| 45 +++-
panel-plugin/xfce4-dict-plugin.c | 2 +-
5 files changed, 27 insertions(+), 40 deletions(-)
diff --git a/lib/dictd.c b/lib/dictd.c
index d9364d7..28f5451 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -750,7 +750,7 @@ void dict_dictd_get_information(GtkWidget *button, DictData
*dd)
dialog = gtk_dialog_new_with_buttons(text,
GTK_WINDOW(dd->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
+ "gtk-close", GTK_RESPONSE_CLOSE, NULL);
vbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
diff --git a/lib/gui.c b/lib/gui.c
index 5c648a3..2f44c54 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -590,7 +590,7 @@ static void update_search_button(DictData *dd, GtkWidget
*box)
{
case DICTMODE_DICT:
{
- image = gtk_image_new_from_stock(GTK_STOCK_FIND,
GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name("gtk-find",
GTK_ICON_SIZE_BUTTON);
break;
}
case DICTMODE_WEB:
@@ -600,7 +600,7 @@ static void update_search_button(DictData *dd, GtkWidget
*box)
}
case DICTMODE_SPELL:
{
- image = gtk_image_new_from_stock(GTK_STOCK_SPELL_CHECK,
GTK_ICON_SIZE_BUTTON);
+ image = gtk_image_new_from_icon_name("gtk-spell-check",
GTK_ICON_SIZE_BUTTON);
break;
}
default:
@@ -784,7 +784,7 @@ void dict_gui_create_main_window(DictData *dd)
button = gtk_button_new_with_mnemonic(_("Speed _Reader"));
gtk_button_set_image(GTK_BUTTON(button),
- gtk_image_new_from_stock(GTK_STOCK_JUSTIFY_CENTER,
GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name("gtk-justify-center",
GTK_ICON_SIZE_MENU));
g_signal_connect(button, "clicked", G_CALLBACK(speedreader_clicked_cb),
dd);
gtk_widget_show(button);
gtk_box_pack_start(GTK_BOX(entry_box), button, FALSE, FALSE, 2);
diff --git a/lib/prefs.c b/lib/prefs.c
index 90a0006..9aad6c5 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -223,11 +223,11 @@ static gboolean spell_entry_focus_cb(GtkEntry *entry,
GdkEventFocus *ev, GtkWidg
if (path != NULL)
{
- gtk_image_set_from_stock(GTK_IMAGE(icon), GTK_STOCK_YES,
GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name(GTK_IMAGE(icon), "gtk-yes",
GTK_ICON_SIZE_BUTTON);
g_free(path);
}
else
- gtk_image_set_from_stock(GTK_IMAGE(icon), GTK_STOCK_STOP,
GTK_ICON_SIZE_BUTTON);
+ gtk_image_set_from_icon_name(GTK_IMAGE(icon), "gtk-stop",
GTK_ICON_SIZE_BUTTON);
return FALSE;
}
@@ -499,14 +499,14 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
g_object_set_data(G_OBJECT(dialog), "port_spinner",
port_spinner);
g_object_set_data(G_OBJECT(dialog), "dict_combo", dict_combo);
- button_get_list = gtk_button_new_from_stock("gtk-refresh");
+ button_get_list = gtk_button_new_from_icon_name("gtk-refresh",
GTK_ICON_SIZE_BUTTON);
gtk_widget_show(button_get_list);
g_signal_connect(button_get_list, "clicked",
G_CALLBACK(dict_dictd_get_list), dd);
g_object_set_data(G_OBJECT(button_get_list), "dict_combo",
dict_combo);
g_object_set_data(G_OBJECT(button_get_list), "port_spinner",
port_spinner);
g_object_set_data(G_OBJECT(button_get_list), "server_entry",
server_entry);
- button_get_info = gtk_button_new_from_stock("gtk-info");
+ button_get_info = gtk_button_new_from_icon_name("gtk-info",
GTK_ICON_SIZE_BUTTON);
gtk_widget_show(button_get_info);
g_signal_connect(button_get_info, "clicked",
G_CALLBACK(dict_dictd_get_information), dd);
g_object_set_data(G_OBJECT(button_get_info), "port_spinner",
port_spinner);
@@ -649,9 +649,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
g_signal_connect(spell_combo, "changed",
G_CALLBACK(spell_combo_
[Xfce4-commits] [apps/xfce4-dict] 30/43: Replace Gtk Pixbuf Inline by Resource
This is an automated email from the git hooks/post-receive script. andre pushed a commit to branch master in repository apps/xfce4-dict. commit a557218587e1470577db360d07155e1ca3e3010a Author: Andre Miranda Date: Sun Aug 21 18:34:32 2016 -0300 Replace Gtk Pixbuf Inline by Resource --- .gitignore | 2 + Makefile.am | 4 +- lib/Makefile.am | 23 +- lib/gui.c| 17 +- lib/gui.h| 1 - lib/inline-icon.h| 420 --- lib/resources.xml| 6 + panel-plugin/xfce4-dict-plugin.c | 43 ++-- xfce4-dict.svg => pixmaps/xfce4-dict.svg | 0 9 files changed, 42 insertions(+), 474 deletions(-) diff --git a/.gitignore b/.gitignore index abede82..426ccb0 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,5 @@ compile autom4te* INSTALL xfce4-dict-*.tar.bz2 +lib/resources.c +lib/resources.h diff --git a/Makefile.am b/Makefile.am index 01cc3f2..669024a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ - xfce4-dict.svg + pixmaps/xfce4-dict.svg DISTCLEANFILES = \ intltool-extract \ @@ -27,7 +27,7 @@ DISTCLEANFILES = \ intltool-update hicolor48dir = $(datadir)/icons/hicolor/scalable/apps -hicolor48_DATA = xfce4-dict.svg +hicolor48_DATA = pixmaps/xfce4-dict.svg gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor diff --git a/lib/Makefile.am b/lib/Makefile.am index 874f386..70f43db 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -11,6 +11,8 @@ libdict_la_SOURCES = \ libdict.h \ prefs.c \ prefs.h \ + resources.c \ + resources.h \ speedreader.c \ speedreader.h \ spell.c \ @@ -30,19 +32,12 @@ libdict_la_LIBADD = \ $(LIBXFCE4UI_LIBS) \ @GTHREAD_LIBS@ +DISTCLEANFILES = \ + resources.c \ + resources.h -noinst_DATA = \ - inline-icon.h +resources.c: + glib-compile-resources resources.xml --sourcedir=../pixmaps --generate-source --c-name dict -EXTRA_DIST = \ - inline-icon.h - -if MAINTAINER_MODE -# the target isn't named as the header file on -# purpose to avoid automatic creation of the file -# while building -inline-icon: $(top_srcdir)/xfce4-dict.svg - gdk-pixbuf-csource --raw\ - --name=dict_icon_data \ - $(top_srcdir)/xfce4-dict.svg > $(srcdir)/inline-icon.h -endif +resources.h: + glib-compile-resources resources.xml --sourcedir=../pixmaps --generate-header --c-name dict diff --git a/lib/gui.c b/lib/gui.c index 7bb1513..8e464b8 100644 --- a/lib/gui.c +++ b/lib/gui.c @@ -32,7 +32,7 @@ #include "common.h" #include "gui.h" -#include "inline-icon.h" +#include "resources.h" #include "speedreader.h" @@ -384,7 +384,7 @@ static void textview_populate_popup_cb(GtkTextView *textview, GtkMenu *menu, Dic gtk_container_add (GTK_CONTAINER (box), icon); gtk_container_add (GTK_CONTAINER (box), label); gtk_container_add (GTK_CONTAINER (search), box); - + gtk_widget_show_all(search); gtk_widget_set_sensitive(GTK_WIDGET(search), textview_is_text_at_cursor(dd)); gtk_menu_shell_
[Xfce4-commits] [apps/xfce4-dict] 28/43: Fix server information button
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 915da4b21cb53312cf1fdf8fba419f39b3059a09
Author: Andre Miranda
Date: Sun Aug 21 17:41:31 2016 -0300
Fix server information button
---
lib/prefs.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/prefs.c b/lib/prefs.c
index 4354900..3f10a1a 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -525,7 +525,6 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
gtk_widget_set_hexpand(server_entry, TRUE);
gtk_grid_attach(GTK_GRID(grid), button_get_info, 2, 0, 1, 1);
- gtk_widget_set_hexpand(button_get_info, TRUE);
gtk_grid_attach(GTK_GRID(grid), label2, 0, 1, 1, 1);
gtk_widget_set_valign (label2, GTK_ALIGN_CENTER);
@@ -642,7 +641,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
g_signal_connect(spell_combo, "changed",
G_CALLBACK(spell_combo_changed_cb), dd);
gtk_widget_show(spell_combo);
- button_refresh = gtk_button_new_from_icon_name("gtk-info",
GTK_ICON_SIZE_BUTTON);
+ button_refresh = gtk_button_new_from_icon_name("gtk-refresh",
GTK_ICON_SIZE_BUTTON);
gtk_widget_show(button_refresh);
g_object_set_data(G_OBJECT(button_refresh), "spell_combo",
spell_combo);
g_signal_connect(button_refresh, "clicked",
G_CALLBACK(button_dict_refresh_cb), dd);
--
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
[Xfce4-commits] [apps/xfce4-dict] 21/43: Rework menus preserving icons
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 5433451c0f60ccb120b1a7bc65d3aa1af27d88b1
Author: Andre Miranda
Date: Wed Jul 20 23:15:41 2016 -0300
Rework menus preserving icons
---
lib/gui.c | 103 ++
1 file changed, 84 insertions(+), 19 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index afb125a..ca9048e 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -356,20 +356,36 @@ static gboolean textview_is_hyperlink_at_cursor(DictData
*dd)
static void textview_populate_popup_cb(GtkTextView *textview, GtkMenu *menu,
DictData *dd)
{
- GtkWidget *search = gtk_image_menu_item_new_from_stock(GTK_STOCK_FIND,
NULL);
- GtkWidget *copy_link = gtk_image_menu_item_new_with_label(_("Copy
Link"));
+ GtkWidget *box, *icon, *label;
+
+ GtkWidget *search = gtk_menu_item_new ();
+ GtkWidget *copy_link = gtk_menu_item_new ();
GtkWidget *sep = gtk_separator_menu_item_new();
- GtkWidget *copy_link_image = gtk_image_new_from_stock(GTK_STOCK_COPY,
GTK_ICON_SIZE_MENU);
gtk_widget_show(sep);
gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), sep);
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(copy_link),
copy_link_image);
- gtk_widget_show(copy_link);
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ icon = gtk_image_new_from_icon_name ("gtk-copy", GTK_ICON_SIZE_MENU);
+ label = gtk_label_new (_("Copy Link"));
+
+ gtk_container_add (GTK_CONTAINER (box), icon);
+ gtk_container_add (GTK_CONTAINER (box), label);
+ gtk_container_add (GTK_CONTAINER (copy_link), box);
+
+ gtk_widget_show_all(copy_link);
gtk_widget_set_sensitive(GTK_WIDGET(copy_link),
textview_is_hyperlink_at_cursor(dd));
gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), copy_link);
- gtk_widget_show(search);
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ icon = gtk_image_new_from_icon_name ("gtk-find", GTK_ICON_SIZE_MENU);
+ label = gtk_label_new (_("Search"));
+
+ gtk_container_add (GTK_CONTAINER (box), icon);
+ gtk_container_add (GTK_CONTAINER (box), label);
+ gtk_container_add (GTK_CONTAINER (search), box);
+
+ gtk_widget_show_all(search);
gtk_widget_set_sensitive(GTK_WIDGET(search),
textview_is_text_at_cursor(dd));
gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), search);
@@ -683,46 +699,95 @@ static void speedreader_clicked_cb(GtkButton *button,
DictData *dd)
static GtkWidget *create_file_menu(DictData *dd)
{
+ GtkWidget *box, *icon, *label;
GtkWidget *menubar, *file, *file_menu, *help, *help_menu, *menu_item;
- GtkAccelGroup *accel_group;
- accel_group = gtk_accel_group_new();
+ GtkAccelGroup *accel_group = gtk_accel_group_new();
gtk_window_add_accel_group(GTK_WINDOW(dd->window), accel_group);
menubar = gtk_menu_bar_new();
+ /* File Menu */
file = gtk_menu_item_new_with_mnemonic(_("_File"));
file_menu = gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(file), file_menu);
- menu_item = gtk_image_menu_item_new_with_mnemonic(_("Speed _Reader"));
- gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),
- gtk_image_new_from_stock(GTK_STOCK_JUSTIFY_CENTER,
GTK_ICON_SIZE_MENU));
- gtk_widget_add_accelerator(menu_item, "activate", accel_group,
- GDK_r, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+ /* Speed Reader */
+ menu_item = gtk_menu_item_new();
+ box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ icon = gtk_image_new_from_icon_name ("gtk-justify-center",
GTK_ICON_SIZE_MENU);
+ label = gtk_accel_label_new (_("Speed _Reader"));
+
+ gtk_label_set_use_underline (GTK_LABEL (label), TRUE);
+ gtk_label_set_xalign (GTK_LABEL (label), 0.0);
+ gtk_widget_add_accelerator (menu_item, "activate", accel_group,
+GDK_KEY_r, GDK_CONTROL_MASK,
GTK_ACCEL_VISIBLE);
+ gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menu_item);
+
+ gtk_box_pack_start (GTK_BOX (box), icon, FALSE, FALSE , 0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (menu_item), box);
+
g_signal_connect(menu_item, "activate",
G_CALLBACK(speedreader_clicked_cb), dd);
gtk_container_add(GTK_CONTAINER(file_menu), menu_item);
+ /* Separator */
gtk_container_add(GTK_CONTAINER(file_menu),
gtk_separator_menu_item_new());
- dd->pref_menu_item =
gtk_image_menu_item_new_from_stock("gtk-preferences", accel_group);
- gtk_widget_add_accelerator(dd->pref_menu_item, "activate", accel_group,
- GDK_p, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
+ /* Preferences */
+ d
[Xfce4-commits] [apps/xfce4-dict] 40/43: Fixing a couple of warnings
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit ba40f5e7e0c629d1c4e0d153342ce76c91254b32
Author: Andre Miranda
Date: Sat Oct 22 17:08:23 2016 -0300
Fixing a couple of warnings
---
lib/spell.c| 1 -
src/popup_plugin.c | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/spell.c b/lib/spell.c
index ebadc2f..8d7b5ca 100644
--- a/lib/spell.c
+++ b/lib/spell.c
@@ -351,7 +351,6 @@ void dict_spell_get_dictionaries(DictData *dd, GtkWidget
*spell_combo)
gchar *tmp = NULL;
gchar *cmd, *locale_cmd;
gboolean use_enchant = FALSE;
- GtkTreeIter iter;
if (strstr(entry_cmd, "enchant") != NULL)
{
diff --git a/src/popup_plugin.c b/src/popup_plugin.c
index 260cb54..5c7bcd6 100644
--- a/src/popup_plugin.c
+++ b/src/popup_plugin.c
@@ -26,6 +26,9 @@
#include "libdict.h"
+gboolean dict_find_panel_plugin(gchar flags, const gchar *text);
+
+
gboolean dict_find_panel_plugin(gchar flags, const gchar *text)
{
gboolean ret = FALSE;
--
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
[Xfce4-commits] [apps/xfce4-dict] 41/43: Change build order for dbus.c
This is an automated email from the git hooks/post-receive script. andre pushed a commit to branch master in repository apps/xfce4-dict. commit cc98104744bdbed416054674596d4467f2e9db2e Author: Andre Miranda Date: Sun Oct 23 12:48:30 2016 -0300 Change build order for dbus.c --- lib/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index a9e1dea..44f9c4e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -2,10 +2,10 @@ noinst_LTLIBRARIES = \ libdict.la libdict_la_SOURCES = \ - common.c \ - common.h \ dbus.c \ dbus.h \ + common.c \ + common.h \ dictd.c \ dictd.h \ gui.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
[Xfce4-commits] [apps/xfce4-dict] 33/43: Make speedreader intro visible
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 5176ec9f45ca5f20bb1c3fc00a0d245f91b94aaa
Author: Andre Miranda
Date: Mon Aug 22 21:46:55 2016 -0300
Make speedreader intro visible
---
lib/speedreader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/speedreader.c b/lib/speedreader.c
index f9b5e27..b5aa558 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -601,6 +601,7 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog)
label_intro = xfd_wrap_label_new(
_("This is an easy speed reading utility to help train you to
read faster. "
"It does this by flashing words at a rapid rate on the
screen."));
+ gtk_label_set_line_wrap ( GTK_LABEL (label_intro), TRUE);
label_words = gtk_label_new_with_mnemonic(_("_Words per Minute:"));
gtk_widget_set_halign(label_words, GTK_ALIGN_END);
@@ -744,4 +745,3 @@ GtkWidget *xfd_speed_reader_new(GtkWindow *parent, DictData
*dd)
return dialog;
}
-
--
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
[Xfce4-commits] [apps/xfce4-dict] 29/43: Replace GtkWidgetClass::size_request by get_preferred_width/height
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit ec81b772df9271bab49ccc7708b98486bc28b094
Author: Andre Miranda
Date: Sun Aug 21 18:01:26 2016 -0300
Replace GtkWidgetClass::size_request by get_preferred_width/height
---
lib/wraplabel.c | 24 +++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/lib/wraplabel.c b/lib/wraplabel.c
index 1c454b4..b1d10cf 100644
--- a/lib/wraplabel.c
+++ b/lib/wraplabel.c
@@ -55,13 +55,16 @@ G_DEFINE_TYPE(XfdWrapLabel, xfd_wrap_label, GTK_TYPE_LABEL);
static void xfd_wrap_label_size_request(GtkWidget *widget,
GtkRequisition *req);
static void xfd_wrap_label_size_allocate (GtkWidget *widget,
GtkAllocation *alloc);
static void xfd_wrap_label_set_wrap_width (GtkWidget *widget, gsize
width);
+static void xfd_wrap_label_get_preferred_width (GtkWidget *widget, gint
*minimal_width, gint *natural_width);
+static void xfd_wrap_label_get_preferred_height(GtkWidget *widget,
gint *minimal_height, gint *natural_height);
static void xfd_wrap_label_class_init(XfdWrapLabelClass *klass)
{
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
- widget_class->size_request = xfd_wrap_label_size_request;
+ widget_class->get_preferred_width = xfd_wrap_label_get_preferred_width;
+ widget_class->get_preferred_height =
xfd_wrap_label_get_preferred_height;
widget_class->size_allocate = xfd_wrap_label_size_allocate;
g_type_class_add_private(klass, sizeof (XfdWrapLabelPrivate));
@@ -121,6 +124,25 @@ static void xfd_wrap_label_size_allocate(GtkWidget
*widget, GtkAllocation *alloc
}
+static void
+xfd_wrap_label_get_preferred_width (GtkWidget *widget, gint *minimal_width,
gint *natural_width)
+{
+ GtkRequisition requisition;
+
+ xfd_wrap_label_size_request (widget, &requisition);
+ *minimal_width = *natural_width = requisition.width;
+}
+
+static void
+xfd_wrap_label_get_preferred_height (GtkWidget *widget, gint *minimal_height,
gint *natural_height)
+{
+ GtkRequisition requisition;
+
+ xfd_wrap_label_size_request (widget, &requisition);
+ *minimal_height = *natural_height = requisition.height;
+}
+
+
void xfd_wrap_label_set_text(GtkLabel *label, const gchar *text)
{
XfdWrapLabelPrivate *priv = XFD_WRAP_LABEL_GET_PRIVATE(label);
--
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
[Xfce4-commits] [apps/xfce4-dict] 07/43: Use gtk_widget_set_halign/valign instead of gtk_misc_set_alignment()
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 3d86504e546fc6f3eafe8bc1a34570904fc080bb
Author: Andre Miranda
Date: Tue Jun 21 23:28:00 2016 -0300
Use gtk_widget_set_halign/valign instead of gtk_misc_set_alignment()
---
lib/prefs.c | 7 ++-
lib/speedreader.c | 9 ++---
lib/wraplabel.c | 1 -
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/lib/prefs.c b/lib/prefs.c
index 2017273..90a0006 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -300,7 +300,6 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
label = gtk_label_new(_("Default search method:"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(inner_vbox), label, FALSE, FALSE, 0);
@@ -342,7 +341,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
label = gtk_label_new(_("Colors:"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 1);
+ gtk_widget_set_valign(label, GTK_ALIGN_END);
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(inner_vbox), label, FALSE, FALSE, 5);
@@ -402,7 +401,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
label = gtk_label_new(_("Panel Text Field:"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 1);
+ gtk_widget_set_valign(label, GTK_ALIGN_END);
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(inner_vbox), label, FALSE,
FALSE, 5);
@@ -566,7 +565,6 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
label = gtk_label_new(_("Web search URL:"));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
gtk_widget_show(label);
gtk_box_pack_start(GTK_BOX(inner_vbox), label, FALSE, FALSE, 0);
@@ -591,7 +589,6 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
g_object_set_data(G_OBJECT(dialog), "web_entry", web_entry);
label1 = xfd_wrap_label_new(_("Enter the URL of a web site
which offers translation or dictionary services. Use {word} as placeholder for
the searched word."));
- gtk_misc_set_alignment(GTK_MISC(label1), 0, 0);
gtk_widget_show(label1);
gtk_box_pack_start(GTK_BOX(inner_vbox), label1, FALSE, FALSE,
0);
gtk_box_pack_start(GTK_BOX(notebook_vbox), inner_vbox, TRUE,
TRUE, 5);
diff --git a/lib/speedreader.c b/lib/speedreader.c
index e2b25cb..4a69944 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -585,7 +585,8 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog)
"It does this by flashing words at a rapid rate on the
screen."));
label_words = gtk_label_new_with_mnemonic(_("_Words per Minute:"));
- gtk_misc_set_alignment(GTK_MISC(label_words), 1, 0.5);
+ gtk_widget_set_halign(label_words, GTK_ALIGN_END);
+ gtk_widget_set_valign(label_words, GTK_ALIGN_CENTER);
priv->spin_wpm = gtk_spin_button_new_with_range(5.0, 1.0, 5);
gtk_label_set_mnemonic_widget(GTK_LABEL(label_words), priv->spin_wpm);
@@ -598,7 +599,8 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog)
gtk_box_pack_start(GTK_BOX(hbox_words), priv->check_mark_paragraphs,
FALSE, FALSE, 12);
label_grouping = gtk_label_new_with_mnemonic(_("Word _Grouping:"));
- gtk_misc_set_alignment(GTK_MISC(label_grouping), 1, 0.5);
+ gtk_widget_set_halign(label_grouping, GTK_ALIGN_END);
+ gtk_widget_set_valign(label_grouping, GTK_ALIGN_CENTER);
label_grouping_desc = gtk_label_new(NULL);
@@ -614,7 +616,8 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog)
gtk_box_pack_start(GTK_BOX(hbox_grouping), label_grouping_desc, FALSE,
FALSE, 6);
label_font = gtk_label_new_with_mnemonic(_("_Font Size:"));
- gtk_misc_set_alignment(GTK_MISC(label_font), 1, 0.5);
+ gtk_widget_set_halign(label_font, GTK_ALIGN_END);
+ gtk_widget_set_valign(label_font, GTK_ALIGN_CENTER);
priv->button_font = gtk_font_button_new();
gtk_label_set_mnemonic_widget(GTK_LABEL(label_font), priv->button_font);
diff --git a/lib/wraplabel.c b/lib/wraplabel.c
index f7f9fb9..1c454b4 100644
--- a/lib/wraplabel.c
+++ b/lib/wraplabel.c
@@ -138,7 +138,6 @@ GtkWidget *xfd_wrap_label_new(const gchar *text)
gtk_label_set_text(GTK_LABEL(l), text);
[Xfce4-commits] [apps/xfce4-dict] 38/43: Using gdbus as IPC mechanism
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit aa47ee82a3d946af9f5daa91f9b7a77f3138a167
Author: Andre Miranda
Date: Sat Oct 22 16:56:39 2016 -0300
Using gdbus as IPC mechanism
---
.gitignore | 2 ++
configure.ac.in | 5 +++
lib/Makefile.am | 14 +---
lib/common.c | 36 +++-
lib/common.h | 7 ++--
lib/dbus.xml | 8 +
lib/libdict.h| 1 +
panel-plugin/xfce4-dict-plugin.c | 35 ++-
src/popup_plugin.c | 72
src/xfce4-dict.c | 2 ++
10 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/.gitignore b/.gitignore
index 426ccb0..2cda42f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@ INSTALL
xfce4-dict-*.tar.bz2
lib/resources.c
lib/resources.h
+lib/dbus.c
+lib/dbus.h
diff --git a/configure.ac.in b/configure.ac.in
index e4b7a59..61038f6 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -61,6 +61,11 @@ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0],
[4.10.0])
XDT_CHECK_PACKAGE([X11], [x11])
dnl ***
+dnl *** Check for gdbus-codegen ***
+dnl ***
+AC_CHECK_PROG([GDBUS_CODEGEN],[gdbus-codegen],[gdbus-codegen])
+
+dnl ***
dnl *** Check for debugging support ***
dnl ***
XDT_FEATURE_DEBUG()
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9fdaa51..a9e1dea 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,6 +4,8 @@ noinst_LTLIBRARIES =
\
libdict_la_SOURCES = \
common.c
\
common.h
\
+ dbus.c
\
+ dbus.h
\
dictd.c
\
dictd.h
\
gui.c
\
@@ -33,14 +35,18 @@ libdict_la_LIBADD =
\
@GTHREAD_LIBS@
DISTCLEANFILES =
\
- resources.c
\
- resources.h
+ resources.c
\
+ resources.h
\
+ dbus.c
\
+ dbus.h
-gui.c: resources.c resources.h
+gui.c: resources.c dbus.c
-resources.c:
+resources.c: resources.h
glib-compile-resources resources.xml --sourcedir=../pixmaps
--generate-source --c-name dict
resources.h:
glib-compile-resources resources.xml --sourcedir=../pixmaps
--generate-header --c-name dict
+dbus.c:
+ gdbus-codegen --interface-prefix org.xfce --generate-c-code dbus
dbus.xml
diff --git a/lib/common.c b/lib/common.c
index 31bc45d..271482c 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -38,6 +38,7 @@
#include "spell.h"
#include "dictd.h"
#include "gui.h"
+#include "dbus.h"
@@ -217,7 +218,8 @@ void dict_search_word(DictData *dd, const gchar *word)
/* sanity checks */
if (! NZV(word))
{
- dict_gui_status_add(dd, _("Invalid input"));
+ /* Just show the main window */
+ dict_gui_show_main_window(dd);
return;
}
@@ -591,3 +593,35 @@ gchar *dict_get_clipboard_contents(void)
return text;
}
+
+
+static gboolean on_handle_search(Dict *skeleton, GDBusMethodInvocation
*invocation,
+ const gchar *arg_phrase, gpointer user_data)
+{
+ dict_search_word((DictData *) user_data, arg_phrase);
+ dict_complete_search(skeleton, invocation);
+ return TRUE;
+}
+
+
+static void on_name_acquired(GDBusConnection *connection, const gchar *name,
+ gpointer user_data)
+{
+ Dict *skeleton = dict_skeleton_new();
+ g_signal_connect (skeleton, "handle-search",
G_CALLBACK(on_handle_search), user_data);
+ g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (skeleton),
+ connection, "/org/xfce/Dict", NULL);
+}
+
+
+void dict_acquire_dbus_name(DictData *dd)
+{
+ g_bus_own_name(G_BUS_TYPE_SESSION,
[Xfce4-commits] [apps/xfce4-dict] 31/43: Remove dangling function
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 16a6552cb3b389a81b22f1bad7e1791e7721d17d
Author: Andre Miranda
Date: Mon Aug 22 21:19:40 2016 -0300
Remove dangling function
---
lib/common.c | 11 ---
1 file changed, 11 deletions(-)
diff --git a/lib/common.c b/lib/common.c
index f16b81f..8a52578 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -302,17 +302,6 @@ static void parse_geometry(DictData *dd, const gchar *str)
}
-static gdouble scale_round(gdouble val, gdouble factor)
-{
- /*val = floor(val * factor + 0.5);*/
- val = floor(val);
- val = MAX(val, 0);
- val = MIN(val, factor);
-
- return val;
-}
-
-
static gchar *get_spell_program(void)
{
gchar *path;
--
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
[Xfce4-commits] [apps/xfce4-dict] 06/43: Replace remaining GdkColor by GdkRGBA
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 7ea47fc416dc517f989bc29c9942216c8e516536
Author: Andre Miranda
Date: Tue Jun 21 23:23:10 2016 -0300
Replace remaining GdkColor by GdkRGBA
---
lib/prefs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/prefs.c b/lib/prefs.c
index 5f3d950..2017273 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -203,9 +203,9 @@ const gchar *dict_prefs_get_web_url_label(DictData *dd)
}
-static void color_set_cb(GtkColorButton *widget, GdkColor *color)
+static void color_set_cb(GtkColorChooser *widget, GdkRGBA *color)
{
- gtk_color_button_get_color(widget, color);
+ gtk_color_chooser_get_rgba(widget, color);
}
--
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
[Xfce4-commits] [apps/xfce4-dict] 24/43: Remove GtkTooltips
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 8dfb917c9ba3fe6293d51ff912d9efa0cd794a2b
Author: Andre Miranda
Date: Sun Aug 21 15:53:00 2016 -0300
Remove GtkTooltips
---
panel-plugin/xfce4-dict-plugin.c | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index c9f1ac2..031e98f 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -43,8 +43,6 @@ typedef struct
DictData *dd;
XfcePanelPlugin *plugin;
- GtkTooltips *tooltips;
-
GtkWidget *panel_button;
GtkWidget *panel_button_image;
GtkWidget *box;
@@ -227,8 +225,6 @@ static void dict_plugin_free_data(XfcePanelPlugin *plugin,
DictPanelData *dpd)
if (dialog != NULL)
gtk_widget_destroy(dialog);
- gtk_object_sink(GTK_OBJECT(dpd->tooltips));
-
dict_free_data(dpd->dd);
g_free(dpd);
}
@@ -375,9 +371,7 @@ static void dict_plugin_construct(XfcePanelPlugin *plugin)
dict_read_rc_file(dpd->dd);
dpd->panel_button = xfce_create_panel_button();
-
- dpd->tooltips = gtk_tooltips_new();
- gtk_tooltips_set_tip(dpd->tooltips, dpd->panel_button, _("Look up a
word"), NULL);
+ gtk_widget_set_tooltip_text (dpd->panel_button, _("Look up a word"));
dpd->panel_button_image = gtk_image_new();
gtk_container_add(GTK_CONTAINER(dpd->panel_button),
GTK_WIDGET(dpd->panel_button_image));
--
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
[Xfce4-commits] [apps/xfce4-dict] 04/43: Use GtkBox instead of GtkHBox/GtkVBox
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit e5aa9e0b02681a8bb00426cccbd0673881234ec6
Author: Andre Miranda
Date: Tue Jun 21 23:08:06 2016 -0300
Use GtkBox instead of GtkHBox/GtkVBox
---
lib/dictd.c | 2 +-
lib/gui.c| 8
lib/prefs.c | 20 ++--
lib/speedreader.c| 14 +++---
panel-plugin/xfce4-dict-plugin.c | 2 +-
5 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/lib/dictd.c b/lib/dictd.c
index f2e9781..d9364d7 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -751,7 +751,7 @@ void dict_dictd_get_information(GtkWidget *button, DictData
*dd)
GTK_WINDOW(dd->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
- vbox = gtk_vbox_new(FALSE, 12);
+ vbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
gtk_box_set_spacing(GTK_BOX(vbox), 6);
diff --git a/lib/gui.c b/lib/gui.c
index 971af69..5c648a3 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -739,19 +739,19 @@ void dict_gui_create_main_window(DictData *dd)
gtk_window_set_icon(GTK_WINDOW(dd->window), icon);
g_object_unref(icon);
- main_box = gtk_vbox_new(FALSE, 0);
+ main_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show(main_box);
gtk_container_add(GTK_CONTAINER(dd->window), main_box);
gtk_box_pack_start(GTK_BOX(main_box), create_file_menu(dd), FALSE,
TRUE, 0);
/* entry box (label, entry, buttons) */
- entry_box = gtk_hbox_new(FALSE, 5);
+ entry_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_widget_show(entry_box);
gtk_container_set_border_width(GTK_CONTAINER(entry_box), 2);
gtk_box_pack_start(GTK_BOX(main_box), entry_box, FALSE, TRUE, 5);
- label_box = gtk_hbox_new(FALSE, 5);
+ label_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_widget_show(label_box);
gtk_box_pack_start(GTK_BOX(entry_box), label_box, TRUE, TRUE, 5);
@@ -799,7 +799,7 @@ void dict_gui_create_main_window(DictData *dd)
gtk_box_pack_end(GTK_BOX(entry_box), dd->close_button, FALSE, FALSE, 0);
/* search method chooser */
- method_chooser = gtk_hbox_new(FALSE, 0);
+ method_chooser = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show(method_chooser);
gtk_box_pack_start(GTK_BOX(main_box), method_chooser, FALSE, FALSE, 0);
diff --git a/lib/prefs.c b/lib/prefs.c
index d8bc6dd..2ff5e46 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -292,9 +292,9 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
GtkWidget *color_link, *color_phon, *color_success,
*color_error;
GSList *search_method;
- notebook_vbox = gtk_vbox_new(FALSE, 2);
+ notebook_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
gtk_widget_show(notebook_vbox);
- inner_vbox = gtk_vbox_new(FALSE, 5);
+ inner_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 5);
gtk_widget_show(inner_vbox);
gtk_notebook_insert_page(GTK_NOTEBOOK(notebook),
@@ -437,7 +437,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
gtk_widget_show(panel_entry_size_spinner);
- pe_hbox = gtk_hbox_new(FALSE, 0);
+ pe_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_widget_show(pe_hbox);
gtk_box_pack_start(GTK_BOX(pe_hbox),
panel_entry_size_label, FALSE, FALSE, 10);
@@ -461,9 +461,9 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
GtkWidget *table, *button_get_list, *button_get_info;
GtkWidget *server_entry, *port_spinner, *dict_combo;
- notebook_vbox = gtk_vbox_new(FALSE, 2);
+ notebook_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_widget_show(notebook_vbox);
- inner_vbox = gtk_vbox_new(FALSE, 5);
+ inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width(GTK_CONTAINER(inner_vbox), 5);
gtk_widget_show(inner_vbox);
gtk_notebook_insert_page(GTK_NOTEBOOK(notebook),
@@ -582,9 +582,9 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
{
GtkWidget *label, *web_entry_label, *web_entry, *web_entry_box,
*web_dicts_table;
-
[Xfce4-commits] [apps/xfce4-dict] 36/43: Increment copyright year
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 07b6a3c3b55bf558f8ddc861d3dcfc317a029020
Author: Andre Miranda
Date: Sat Oct 22 14:12:32 2016 -0300
Increment copyright year
---
lib/gui.c| 2 +-
src/xfce4-dict.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index 2b3d60c..9a6b55d 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -1027,7 +1027,7 @@ void dict_gui_about_dialog(GtkWidget *widget, DictData
*dd)
"destroy-with-parent", TRUE,
"authors", authors,
"comments", _("A client program to query different
dictionaries."),
- "copyright", _("Copyright \302\251 2006-2015 Xfce Development
Team"),
+ "copyright", _("Copyright \302\251 2006-2016 Xfce Development
Team"),
"website",
"http://goodies.xfce.org/projects/applications/xfce4-dict";,
"logo", logo,
"translator-credits", _("translator-credits"),
diff --git a/src/xfce4-dict.c b/src/xfce4-dict.c
index 337abc8..4185aad 100644
--- a/src/xfce4-dict.c
+++ b/src/xfce4-dict.c
@@ -140,7 +140,7 @@ gint main(gint argc, gchar *argv[])
if (show_version)
{
g_print("%s %s (Xfce %s)\n\n", PACKAGE, PACKAGE_VERSION,
xfce_version_string());
- g_print("%s\n", "Copyright (c) 2006-2015");
+ g_print("%s\n", "Copyright (c) 2006-2016");
g_print("\tEnrico Tröger \n\n");
g_print(_("Please report bugs to <%s>."), PACKAGE_BUGREPORT);
g_print("\n");
--
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
[Xfce4-commits] [apps/xfce4-dict] 13/43: Replace gdk_window_get_pointer by gdk_window_get_device_position
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit b983044d932dc807848572f2a89b83f65a8e9547
Author: Andre Miranda
Date: Wed Jul 20 22:55:39 2016 -0300
Replace gdk_window_get_pointer by gdk_window_get_device_position
---
lib/gui.c | 24 ++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index c3d9863..b1b97b9 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -226,8 +226,18 @@ static gboolean textview_motion_notify_event(GtkWidget
*text_view, GdkEventMotio
static gboolean textview_visibility_notify_event(GtkWidget *text_view,
GdkEventVisibility *event)
{
gint wx, wy, bx, by;
+ GdkDevice *pointer;
+
+#if GTK_CHECK_VERSION (3,2,0)
+GdkSeat *seat = gdk_display_get_default_seat (gdk_display_get_default ());
+pointer = gdk_seat_get_pointer (seat);
+#else
+GdkDeviceManager *devman = gdk_display_get_device_manager
(gdk_display_get_default ());
+pointer = gdk_device_manager_get_client_pointer (devman);
+#endif
- gdk_window_get_pointer(text_view->window, &wx, &wy, NULL);
+ gdk_window_get_device_position(gtk_widget_get_window (text_view),
+ pointer,
&wx, &wy, NULL);
gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(text_view),
GTK_TEXT_WINDOW_WIDGET, wx, wy, &bx, &by);
@@ -246,8 +256,18 @@ static gchar *textview_get_text_at_cursor(DictData *dd)
if (! gtk_text_buffer_get_selection_bounds(dd->main_textbuffer, &start,
&end))
{
gint wx, wy, bx, by;
+ GdkDevice *pointer;
+
+#if GTK_CHECK_VERSION (3,2,0)
+ GdkSeat *seat = gdk_display_get_default_seat
(gdk_display_get_default ());
+ pointer = gdk_seat_get_pointer (seat);
+#else
+ GdkDeviceManager *devman = gdk_display_get_device_manager
(gdk_display_get_default ());
+ pointer = gdk_device_manager_get_client_pointer (devman);
+#endif
- gdk_window_get_pointer(dd->main_textview->window, &wx, &wy,
NULL);
+ gdk_window_get_device_position(gtk_widget_get_window
(dd->main_textview),
+
pointer, &wx, &wy, NULL);
gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(dd->main_textview),
GTK_TEXT_WINDOW_WIDGET, wx, wy, &bx, &by);
--
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
[Xfce4-commits] [apps/xfce4-dict] 34/43: Remove unnecessary code from About dialog
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 1960bf34a7bf66e6304bc3e49b00d6790cdc9b32
Author: Andre Miranda
Date: Mon Aug 22 21:48:50 2016 -0300
Remove unnecessary code from About dialog
Add myself to Authors :)
---
lib/gui.c | 17 -
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index 8e464b8..2b3d60c 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -1014,24 +1014,15 @@ void dict_gui_show_main_window(DictData *dd)
}
-static void about_activate_link(GtkAboutDialog *about, const gchar *ref,
gpointer data)
-{
- gchar *cmd = g_strconcat("xdg-open ", ref, NULL);
- g_spawn_command_line_async(cmd, NULL);
- g_free(cmd);
-}
-
-
void dict_gui_about_dialog(GtkWidget *widget, DictData *dd)
{
const gchar *authors[]= { "Enrico Tröger ",
- "Harald Judt ",
- NULL };
- const gchar *title = _("Xfce4 Dictionary");
+"Harald Judt ",
+"André Miranda ",
+NULL };
+
GdkPixbuf *logo = gdk_pixbuf_new_from_resource("/org/xfce/dict/icon",
NULL);
- gtk_about_dialog_set_email_hook(about_activate_link, NULL, NULL);
- gtk_about_dialog_set_url_hook(about_activate_link, NULL, NULL);
gtk_show_about_dialog(GTK_WINDOW(dd->window),
"destroy-with-parent", TRUE,
"authors", authors,
--
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
[Xfce4-commits] [apps/xfce4-dict] 11/43: Replace g_thread_create by g_thread_new
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 62dcaad0068795cb6e8a562bcfb5546af225404f
Author: Andre Miranda
Date: Wed Jul 20 22:50:50 2016 -0300
Replace g_thread_create by g_thread_new
---
lib/dictd.c | 2 +-
panel-plugin/xfce4-dict-plugin.c | 2 --
src/xfce4-dict.c | 4 +---
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/lib/dictd.c b/lib/dictd.c
index 8c75cbf..bcaa8b3 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -679,7 +679,7 @@ void dict_dictd_start_query(DictData *dd, const gchar *word)
dictd_init();
/* start the thread to query the server */
- g_thread_create((GThreadFunc) ask_server, dd, FALSE, NULL);
+ g_thread_new(NULL, (GThreadFunc) ask_server, dd);
}
}
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index b137292..6df383b 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -368,8 +368,6 @@ static void dict_plugin_construct(XfcePanelPlugin *plugin)
xfce_textdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
- g_thread_init(NULL);
-
dpd->dd = dict_create_dictdata();
dpd->dd->is_plugin = TRUE;
dpd->plugin = plugin;
diff --git a/src/xfce4-dict.c b/src/xfce4-dict.c
index 0121ddf..337abc8 100644
--- a/src/xfce4-dict.c
+++ b/src/xfce4-dict.c
@@ -83,7 +83,7 @@ static void pref_dialog_activated(GtkMenuItem *menuitem,
DictData *dd)
}
-static gchar get_flags()
+static gchar get_flags(void)
{
gchar flags = 0;
@@ -173,8 +173,6 @@ gint main(gint argc, gchar *argv[])
dd->is_plugin = FALSE;
dd->verbose_mode = verbose_mode;
- g_thread_init(NULL);
-
dict_read_rc_file(dd);
/* set search mode from command line flags, if any */
--
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
[Xfce4-commits] [apps/xfce4-dict] 39/43: Bumping GTK version
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 7b68a0e2f58434a8b7dc6040024ffc86ad3c131e
Author: Andre Miranda
Date: Sat Oct 22 17:08:03 2016 -0300
Bumping GTK version
---
configure.ac.in | 4 ++--
lib/gui.c | 20 +---
lib/speedreader.c | 12 ++--
3 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 61038f6..e8fef79 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,7 +11,7 @@ m4_define([xfce4_dict_version],
[xfce4_dict_version_major().xfce4_dict_version_m
dnl ***
dnl *** Initialize autoconf ***
dnl ***
-AC_COPYRIGHT([Copyright (c) 2006-2015 Xfce Development Team. All rights
reserved.])
+AC_COPYRIGHT([Copyright (c) 2006-2016 Xfce Development Team. All rights
reserved.])
AC_INIT([xfce4-dict], [xfce4_dict_version], [http://bugzilla.xfce.org/],
[xfce4-dict])
AC_PREREQ([2.60])
AC_CONFIG_MACRO_DIR([m4])
@@ -54,7 +54,7 @@ dnl ***
dnl *** Check for required packages ***
dnl ***
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.14.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.10.0])
diff --git a/lib/gui.c b/lib/gui.c
index 9a6b55d..1f453cc 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -227,14 +227,10 @@ static gboolean
textview_visibility_notify_event(GtkWidget *text_view, GdkEventV
{
gint wx, wy, bx, by;
GdkDevice *pointer;
+ GdkSeat *seat;
-#if GTK_CHECK_VERSION (3,2,0)
-GdkSeat *seat = gdk_display_get_default_seat (gdk_display_get_default ());
-pointer = gdk_seat_get_pointer (seat);
-#else
-GdkDeviceManager *devman = gdk_display_get_device_manager
(gdk_display_get_default ());
-pointer = gdk_device_manager_get_client_pointer (devman);
-#endif
+ seat = gdk_display_get_default_seat (gdk_display_get_default ());
+ pointer = gdk_seat_get_pointer (seat);
gdk_window_get_device_position(gtk_widget_get_window (text_view),
pointer,
&wx, &wy, NULL);
@@ -257,14 +253,10 @@ static gchar *textview_get_text_at_cursor(DictData *dd)
{
gint wx, wy, bx, by;
GdkDevice *pointer;
+ GdkSeat *seat;
-#if GTK_CHECK_VERSION (3,2,0)
- GdkSeat *seat = gdk_display_get_default_seat
(gdk_display_get_default ());
+ seat = gdk_display_get_default_seat (gdk_display_get_default
());
pointer = gdk_seat_get_pointer (seat);
-#else
- GdkDeviceManager *devman = gdk_display_get_device_manager
(gdk_display_get_default ());
- pointer = gdk_device_manager_get_client_pointer (devman);
-#endif
gdk_window_get_device_position(gtk_widget_get_window
(dd->main_textview),
pointer, &wx, &wy, NULL);
@@ -412,7 +404,6 @@ static gboolean textview_button_press_cb(GtkTextView *view,
GdkEventButton *even
}
-#if GTK_CHECK_VERSION(2, 12, 0)
static gboolean textview_query_tooltip_cb(GtkWidget *widget, gint x, gint y,
gboolean keyboard_mode,
GtkTooltip *tooltip, DictData *dd)
{
@@ -444,7 +435,6 @@ static gboolean textview_query_tooltip_cb(GtkWidget
*widget, gint x, gint y, gbo
}
return FALSE;
}
-#endif
static void textview_apply_or_remove_tags(GtkTextBuffer *buffer, const gchar
*tag,
diff --git a/lib/speedreader.c b/lib/speedreader.c
index b5aa558..ecf4b97 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -356,6 +356,8 @@ static void sr_start(XfdSpeedReader *dialog)
const gchar *fontname;
gchar *text, *cleaned_text;
GtkTextIter start, end;
+ gchar *css;
+ GtkCssProvider *provider;
/* clear the label text */
gtk_label_set_text(GTK_LABEL(priv->display_label), NULL);
@@ -380,10 +382,6 @@ static void sr_start(XfdSpeedReader *dialog)
/* set the font */
fontname =
gtk_font_button_get_font_name(GTK_FONT_BUTTON(priv->button_font));
-#if GTK_CHECK_VERSION (3, 16, 0)
- gchar *css;
- GtkCssProvider *provider;
-
css = g_strdup_printf("* { font: %s; }", fontname);
provider = gtk_css_provider_new ();
gtk_css_provider_load_from_data (provider, css, -1, NULL);
@@ -392,12 +390,6 @@ static void sr_start(XfdSpeedReader *dialog)
GTK_STYLE_PROVIDER(provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
g_free(css);
-
[Xfce4-commits] [apps/xfce4-dict] 25/43: Replace gtk_combo_box_* by gtk_combo_box_text*
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 2d26c5c9d41046c8b0beea108827c9c4eeec1642
Author: Andre Miranda
Date: Sun Aug 21 16:38:14 2016 -0300
Replace gtk_combo_box_* by gtk_combo_box_text*
---
lib/common.c | 2 +-
lib/dictd.c | 4 ++--
lib/gui.c| 4 ++--
lib/prefs.c | 30 +++---
lib/spell.c | 13 +++--
5 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/lib/common.c b/lib/common.c
index 03a5a2b..f16b81f 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -241,7 +241,7 @@ void dict_search_word(DictData *dd, const gchar *word)
}
/* remove leading and trailing spaces */
g_strstrip(dd->searched_word);
- gtk_combo_box_prepend_text(GTK_COMBO_BOX(dd->main_combo),
dd->searched_word);
+ gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(dd->main_combo),
dd->searched_word);
dict_gui_clear_text_buffer(dd);
diff --git a/lib/dictd.c b/lib/dictd.c
index bcaa8b3..38ca631 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -847,7 +847,7 @@ void dict_dictd_get_list(GtkWidget *button, DictData *dd)
i =
gtk_tree_model_iter_n_children(gtk_combo_box_get_model(GTK_COMBO_BOX(dict_combo)),
NULL);
for (i -= 1; i > 2; i--) /* first three entries (*, ! and ) should
always exist */
{
- gtk_combo_box_remove_text(GTK_COMBO_BOX(dict_combo), i);
+ gtk_combo_box_text_remove(GTK_COMBO_BOX_TEXT(dict_combo), i);
}
/* parse output */
@@ -859,7 +859,7 @@ void dict_dictd_get_list(GtkWidget *button, DictData *dd)
i = 0;
while (i < max_lines && lines[i][0] != '.')
{
- gtk_combo_box_append_text(GTK_COMBO_BOX(dict_combo), lines[i]);
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(dict_combo),
lines[i]);
i++;
}
diff --git a/lib/gui.c b/lib/gui.c
index 237e0a3..7bb1513 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -558,7 +558,7 @@ static void combo_changed_cb(GtkComboBox *combo, DictData
*dd)
if (gtk_combo_box_get_active_iter(combo, &iter))
{
- gchar *text = gtk_combo_box_get_active_text(combo);
+ gchar *text =
gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(combo));
dict_search_word(dd, text);
g_free(text);
}
@@ -842,7 +842,7 @@ void dict_gui_create_main_window(DictData *dd)
gtk_widget_show(label_box);
gtk_box_pack_start(GTK_BOX(entry_box), label_box, TRUE, TRUE, 5);
- dd->main_combo = gtk_combo_box_entry_new_text();
+ dd->main_combo = gtk_combo_box_text_new_with_entry();
gtk_widget_show(dd->main_combo);
gtk_box_pack_start(GTK_BOX(label_box), dd->main_combo, TRUE, TRUE, 0);
g_signal_connect(dd->main_combo, "changed",
G_CALLBACK(combo_changed_cb), dd);
diff --git a/lib/prefs.c b/lib/prefs.c
index d7f0815..0a40614 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -92,8 +92,8 @@ void dict_prefs_dialog_response(GtkWidget *dlg, gint
response, DictData *dd)
/* check some values before actually saving the settings in case we
need to return to
* the dialog */
- dictionary = gtk_combo_box_get_active_text(
- GTK_COMBO_BOX(g_object_get_data(G_OBJECT(dlg), "dict_combo")));
+ dictionary = gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(g_object_get_data(G_OBJECT(dlg),
"dict_combo")));
if (! NZV(dictionary) || dictionary[0] == '-')
{
dict_show_msgbox(dd, GTK_MESSAGE_ERROR, _("You have chosen an
invalid dictionary."));
@@ -122,8 +122,8 @@ void dict_prefs_dialog_response(GtkWidget *dlg, gint
response, DictData *dd)
gtk_widget_set_sensitive(dd->radio_button_web, NZV(dd->web_url));
/* MODE SPELL */
- dictionary = gtk_combo_box_get_active_text(
- GTK_COMBO_BOX(g_object_get_data(G_OBJECT(dlg),
"spell_combo")));
+ dictionary = gtk_combo_box_text_get_active_text(
+ GTK_COMBO_BOX_TEXT(g_object_get_data(G_OBJECT(dlg),
"spell_combo")));
if (NZV(dictionary))
{
g_free(dd->spell_dictionary);
@@ -476,11 +476,11 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
/* dictionary */
label3 = gtk_label_new_with_mnemonic(_("Dictionary:"));
- dict_combo = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(dict_combo), _("* (use
all)"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(dict_combo),
+ dict_combo = gtk_combo_box_text_new();
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(dict_combo),
_("* (use all)"));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(dict_combo),
[Xfce4-commits] [apps/xfce4-dict] 43/43: Merge branch 'gtk3'
This is an automated email from the git hooks/post-receive script. andre pushed a commit to branch master in repository apps/xfce4-dict. commit 84987e9f3367f0a9e9d0e194fa58383f43983874 Merge: b923cfb 92ca401 Author: Andre Miranda Date: Mon Oct 31 20:29:11 2016 -0300 Merge branch 'gtk3' .gitignore| 4 + Makefile.am | 4 +- configure.ac.in | 13 +- lib/Makefile.am | 30 ++- lib/common.c | 119 - lib/common.h | 15 +- lib/dbus.xml | 8 + lib/dictd.c | 20 +- lib/gui.c | 225 ++-- lib/gui.h | 1 - lib/inline-icon.h | 420 -- lib/libdict.h | 1 + lib/prefs.c | 293 + lib/resources.xml | 6 + lib/speedreader.c | 90 --- lib/spell.c | 14 +- lib/wraplabel.c | 25 +- panel-plugin/xfce4-dict-plugin.c | 169 +++- panel-plugin/xfce4-dict-plugin.desktop.in | 2 +- xfce4-dict.svg => pixmaps/xfce4-dict.svg | 0 src/popup_plugin.c| 71 ++--- src/xfce4-dict.c | 8 +- 22 files changed, 520 insertions(+), 1018 deletions(-) -- 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
[Xfce4-commits] [apps/xfce4-dict] 42/43: Set main entry text from IPC calls
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 92ca4011380853795c4f4bac4ac775e0a9c62bb0
Author: Andre Miranda
Date: Sun Oct 23 13:02:12 2016 -0300
Set main entry text from IPC calls
---
lib/common.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/common.c b/lib/common.c
index 271482c..cfad1f0 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -218,7 +218,7 @@ void dict_search_word(DictData *dd, const gchar *word)
/* sanity checks */
if (! NZV(word))
{
- /* Just show the main window */
+ /* just show the main window */
dict_gui_show_main_window(dd);
return;
}
@@ -234,13 +234,15 @@ void dict_search_word(DictData *dd, const gchar *word)
dict_gui_set_panel_entry_text(dd, "");
return;
}
- gtk_entry_set_text(GTK_ENTRY(dd->main_entry),
dd->searched_word);
- dict_gui_set_panel_entry_text(dd, dd->searched_word);
}
else
{
dd->searched_word = g_strdup(word);
}
+
+ /* Set the main entry text */
+ gtk_entry_set_text(GTK_ENTRY(dd->main_entry), dd->searched_word);
+
/* remove leading and trailing spaces */
g_strstrip(dd->searched_word);
gtk_combo_box_text_prepend_text(GTK_COMBO_BOX_TEXT(dd->main_combo),
dd->searched_word);
--
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
[Xfce4-commits] [apps/xfce4-dict] 26/43: Replace macros by functions
This is an automated email from the git hooks/post-receive script. andre pushed a commit to branch master in repository apps/xfce4-dict. commit 02d7c23734478aac86ad695b83971b92ec35df2a Author: Andre Miranda Date: Sun Aug 21 16:39:11 2016 -0300 Replace macros by functions --- lib/prefs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/prefs.c b/lib/prefs.c index 0a40614..4354900 100644 --- a/lib/prefs.c +++ b/lib/prefs.c @@ -275,7 +275,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent, DictData *dd) g_signal_connect(dialog, "response", G_CALLBACK(dict_prefs_dialog_response), dd); notebook = gtk_notebook_new(); - GTK_WIDGET_UNSET_FLAGS(notebook, GTK_CAN_FOCUS); + gtk_widget_set_can_focus (notebook, FALSE); gtk_widget_show(notebook); g_object_set_data(G_OBJECT(dialog), "notebook", notebook); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), notebook, FALSE, TRUE, 0); -- 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
[Xfce4-commits] [apps/xfce4-dict] 32/43: Fix build
This is an automated email from the git hooks/post-receive script. andre pushed a commit to branch master in repository apps/xfce4-dict. commit 0f20bd4370a24a4ae91704766fe584330c998ef2 Author: Andre Miranda Date: Mon Aug 22 21:35:38 2016 -0300 Fix build --- lib/Makefile.am | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 70f43db..9fdaa51 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -11,8 +11,8 @@ libdict_la_SOURCES = \ libdict.h \ prefs.c \ prefs.h \ - resources.c \ - resources.h \ + resources.c \ + resources.h \ speedreader.c \ speedreader.h \ spell.c \ @@ -32,12 +32,15 @@ libdict_la_LIBADD = \ $(LIBXFCE4UI_LIBS) \ @GTHREAD_LIBS@ -DISTCLEANFILES = \ - resources.c \ +DISTCLEANFILES = \ + resources.c \ resources.h +gui.c: resources.c resources.h + resources.c: glib-compile-resources resources.xml --sourcedir=../pixmaps --generate-source --c-name dict resources.h: glib-compile-resources resources.xml --sourcedir=../pixmaps --generate-header --c-name dict + -- 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
[Xfce4-commits] [apps/xfce4-dict] 27/43: Fix server information dialog
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit d3a9568c94ef4f3012e522ccd754c75320b73b83
Author: Andre Miranda
Date: Sun Aug 21 17:41:20 2016 -0300
Fix server information dialog
---
lib/dictd.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/dictd.c b/lib/dictd.c
index 38ca631..7664e0c 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -751,24 +751,25 @@ void dict_dictd_get_information(GtkWidget *button,
DictData *dd)
GTK_WINDOW(dd->window),
GTK_DIALOG_DESTROY_WITH_PARENT,
"gtk-close", GTK_RESPONSE_CLOSE, NULL);
- vbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
gtk_container_add(GTK_CONTAINER (gtk_dialog_get_content_area
(GTK_DIALOG (dialog))), vbox);
gtk_box_set_spacing(GTK_BOX(vbox), 6);
g_free(text);
- gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 400);
+ gtk_window_set_default_size(GTK_WINDOW(dialog), 550, 400);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);
text = g_strconcat("", buffer, "", NULL);
label = gtk_label_new(text);
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ gtk_widget_set_vexpand(label, TRUE);
g_free(text);
swin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(swin),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(swin), label);
+ gtk_container_add(GTK_CONTAINER(swin), label);
gtk_box_pack_start(GTK_BOX(vbox), swin, TRUE, TRUE, 0);
@@ -870,4 +871,3 @@ void dict_dictd_get_list(GtkWidget *button, DictData *dd)
* the list and we also don't know whether it exists at all, and I
don't walk through the list */
gtk_combo_box_set_active(GTK_COMBO_BOX(dict_combo), 0);
}
-
--
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
[Xfce4-commits] [apps/xfce4-dict] 22/43: Replace gdk_spawn_on_screen by g_spawn_async
This is an automated email from the git hooks/post-receive script. andre pushed a commit to branch master in repository apps/xfce4-dict. commit 52f2960b42152d235173c519ca1abb51136c26ab Author: Andre Miranda Date: Wed Jul 20 23:17:04 2016 -0300 Replace gdk_spawn_on_screen by g_spawn_async --- lib/common.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/common.c b/lib/common.c index 259202e..03a5a2b 100644 --- a/lib/common.c +++ b/lib/common.c @@ -144,8 +144,7 @@ static gboolean open_browser(DictData *dd, const gchar *uri) argv[1] = (gchar*) uri; argv[2] = NULL; - result = gdk_spawn_on_screen(gtk_widget_get_screen(dd->window), NULL, argv, NULL, - G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); + result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); g_free(browser_path); -- 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
[Xfce4-commits] [apps/xfce4-dict] 35/43: Fix drag and drop internal data access
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 7448b145f782a0a916755b7d980d72bc6c2d5ebd
Author: Andre Miranda
Date: Mon Aug 22 22:26:00 2016 -0300
Fix drag and drop internal data access
---
lib/common.c | 22 --
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/lib/common.c b/lib/common.c
index 8a52578..31bc45d 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -518,27 +518,13 @@ void dict_free_data(DictData *dd)
}
-void dict_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context,
gint x, gint y,
+void dict_drag_data_received(GtkWidget *widget, GdkDragContext *context, gint
x, gint y,
GtkSelectionData
*data, guint info, guint ltime, DictData *dd)
{
- if ((data != NULL) && (data->length >= 0) && (data->format == 8))
+ if ((data != NULL) && (gtk_selection_data_get_length(data) >= 0) &&
(gtk_selection_data_get_format(data) == 8))
{
-/*
- GtkWidget *source = gtk_drag_get_source_widget(drag_context);
-
- if (widget == dd->main_entry &&
- source != NULL &&
- gtk_widget_get_toplevel(source) == dd->window)
- {
- gtk_entry_set_text(GTK_ENTRY(dd->main_entry), "");
- }
- else
-*/ {
- dict_search_word(dd, (const gchar*) data->data);
- }
-
- drag_context->action = GDK_ACTION_COPY;
- gtk_drag_finish(drag_context, TRUE, FALSE, ltime);
+ dict_search_word(dd, (const gchar*) gtk_selection_data_get_data
(data));
+ gtk_drag_finish(context, TRUE, FALSE, ltime);
}
}
--
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
[Xfce4-commits] [apps/xfce4-dict] 15/43: Replace more occurrences of GtkStock by GtkImage
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit aff0f77fe5870e9fa10cd0f54596eb00db7a8e88
Author: Andre Miranda
Date: Wed Jul 20 23:01:41 2016 -0300
Replace more occurrences of GtkStock by GtkImage
---
lib/gui.c | 17 +++--
lib/prefs.c | 2 +-
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index b1b97b9..1bf69e7 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -597,7 +597,9 @@ static void update_search_button(DictData *dd, GtkWidget
*box)
if (button == NULL)
{
- button = gtk_button_new_from_stock(GTK_STOCK_FIND);
+ button = gtk_button_new_with_mnemonic (_("F_ind"));
+ gtk_button_set_image(GTK_BUTTON(button),
+ gtk_image_new_from_icon_name("gtk-find",
GTK_ICON_SIZE_BUTTON));
gtk_widget_show(button);
gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
g_signal_connect(button, "clicked",
G_CALLBACK(entry_button_clicked_cb), dd);
@@ -781,9 +783,9 @@ void dict_gui_create_main_window(DictData *dd)
g_signal_connect(dd->main_combo, "changed",
G_CALLBACK(combo_changed_cb), dd);
dd->main_entry = gtk_bin_get_child(GTK_BIN(dd->main_combo));
- gtk_entry_set_text(GTK_ENTRY(dd->main_entry), _("Search term"));
- gtk_entry_set_icon_from_stock(GTK_ENTRY(dd->main_entry),
GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
- gtk_entry_set_icon_from_stock(GTK_ENTRY(dd->main_entry),
GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
+ gtk_entry_set_placeholder_text(GTK_ENTRY(dd->main_entry), _("Search
term"));
+ gtk_entry_set_icon_from_icon_name(GTK_ENTRY(dd->main_entry),
GTK_ENTRY_ICON_PRIMARY, "gtk-find");
+ gtk_entry_set_icon_from_icon_name(GTK_ENTRY(dd->main_entry),
GTK_ENTRY_ICON_SECONDARY, "gtk-clear");
g_signal_connect(dd->main_entry, "changed",
G_CALLBACK(entry_changed_cb), dd);
g_signal_connect(dd->main_entry, "activate",
G_CALLBACK(entry_activate_cb), dd);
g_signal_connect(dd->main_entry, "icon-release",
G_CALLBACK(entry_icon_release_cb), dd);
@@ -813,8 +815,11 @@ void dict_gui_create_main_window(DictData *dd)
gtk_widget_show(sep);
gtk_box_pack_start(GTK_BOX(entry_box), sep, FALSE, FALSE, 2);
- dd->close_button = gtk_button_new_from_stock(
- (dd->is_plugin) ? GTK_STOCK_CLOSE : GTK_STOCK_QUIT);
+ dd->close_button = gtk_button_new_with_mnemonic ((dd->is_plugin) ?
+ _("_Close") : _("_Quit"));
+ gtk_button_set_image(GTK_BUTTON(dd->close_button),
+ gtk_image_new_from_icon_name((dd->is_plugin) ?
+ "gtk-close" : "gtk-quit", GTK_ICON_SIZE_BUTTON));
gtk_widget_show(dd->close_button);
gtk_box_pack_end(GTK_BOX(entry_box), dd->close_button, FALSE, FALSE, 0);
diff --git a/lib/prefs.c b/lib/prefs.c
index 25c7cb3..6f2bfeb 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -265,7 +265,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
dialog = xfce_titled_dialog_new_with_buttons(
_("Dictionary"), GTK_WINDOW(parent),
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
- GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
+ "gtk-close", GTK_RESPONSE_OK,
NULL);
gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
--
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
[Xfce4-commits] [apps/xfce4-dict] 23/43: Replace gdk_cursor_unref by g_object_unref
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 5dde15c389fb75eec17bb7d2a99f10e60de00b40
Author: Andre Miranda
Date: Thu Jul 21 00:04:21 2016 -0300
Replace gdk_cursor_unref by g_object_unref
---
lib/gui.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index ca9048e..237e0a3 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -803,9 +803,9 @@ static GtkWidget *create_file_menu(DictData *dd)
void dict_gui_finalize(DictData *dd)
{
if (hand_cursor)
- gdk_cursor_unref(hand_cursor);
+ g_object_unref (hand_cursor);
if (regular_cursor)
- gdk_cursor_unref(regular_cursor);
+ g_object_unref (regular_cursor);
}
--
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
[Xfce4-commits] [apps/xfce4-dict] 17/43: Drop GTK_DIALOG_NO_SEPARATOR
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 38d955c90d2384f4cc19a7af89bbc235823a16ca
Author: Andre Miranda
Date: Wed Jul 20 23:06:19 2016 -0300
Drop GTK_DIALOG_NO_SEPARATOR
---
lib/prefs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/prefs.c b/lib/prefs.c
index 6f2bfeb..d7f0815 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -264,7 +264,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
dialog = xfce_titled_dialog_new_with_buttons(
_("Dictionary"), GTK_WINDOW(parent),
- GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
"gtk-close", GTK_RESPONSE_OK,
NULL);
--
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
[Xfce4-commits] [apps/xfce4-dict] 18/43: Replace macros by functions
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit b0805bb16f901ed87247e6598847522f3588db9a
Author: Andre Miranda
Date: Wed Jul 20 23:09:07 2016 -0300
Replace macros by functions
---
panel-plugin/xfce4-dict-plugin.c | 14 +++---
src/popup_plugin.c | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index 6df383b..c9f1ac2 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -114,13 +114,13 @@ static gboolean
dict_plugin_panel_set_size(XfcePanelPlugin *plugin, gint wsize,
static void dict_plugin_panel_button_clicked(GtkWidget *button, DictPanelData
*dpd)
{
- if (GTK_WIDGET_VISIBLE(dpd->dd->window))
+ if (gtk_widget_get_visible(GTK_WIDGET(dpd->dd->window)))
{
/* we must query geometry settings here because position and
maximized state
* doesn't work when the window is hidden */
dict_gui_query_geometry(dpd->dd);
- gtk_widget_hide(dpd->dd->window);
+ gtk_widget_hide(GTK_WIDGET(dpd->dd->window));
}
else
{
@@ -189,16 +189,16 @@ static gboolean dict_plugin_set_selection(DictPanelData
*dpd)
gscreen = gtk_widget_get_screen(win);
g_snprintf(selection_name, sizeof (selection_name),
XFCE_DICT_SELECTION"%d", gdk_screen_get_number(gscreen));
- selection_atom = XInternAtom(GDK_DISPLAY(), selection_name, False);
+ selection_atom =
XInternAtom(gdk_x11_display_get_xdisplay(gdk_display_get_default()),
selection_name, False);
- if (XGetSelectionOwner(GDK_DISPLAY(), selection_atom))
+ if
(XGetSelectionOwner(gdk_x11_display_get_xdisplay(gdk_display_get_default()),
selection_atom))
{
gtk_widget_destroy(win);
return FALSE;
}
- XSelectInput(GDK_DISPLAY(), xwin, PropertyChangeMask);
- XSetSelectionOwner(GDK_DISPLAY(), selection_atom, xwin,
GDK_CURRENT_TIME);
+ XSelectInput(gdk_x11_display_get_xdisplay(gdk_display_get_default()),
xwin, PropertyChangeMask);
+
XSetSelectionOwner(gdk_x11_display_get_xdisplay(gdk_display_get_default()),
selection_atom, xwin, GDK_CURRENT_TIME);
g_signal_connect(win, "client-event",
G_CALLBACK(dict_plugin_message_received), dpd);
@@ -219,7 +219,7 @@ static void dict_plugin_free_data(XfcePanelPlugin *plugin,
DictPanelData *dpd)
/* if the main window is visible, query geometry as usual, if it is
hidden the geometry
* was queried when it was hidden */
- if (GTK_WIDGET_VISIBLE(dpd->dd->window))
+ if (gtk_widget_get_visible(GTK_WIDGET(dpd->dd->window)))
{
dict_gui_query_geometry(dpd->dd);
}
diff --git a/src/popup_plugin.c b/src/popup_plugin.c
index 6e1bef8..7115157 100644
--- a/src/popup_plugin.c
+++ b/src/popup_plugin.c
@@ -35,9 +35,9 @@ static gboolean check_is_running(GtkWidget *widget, Window
*xid)
gscreen = gtk_widget_get_screen(widget);
g_snprintf(selection_name, sizeof(selection_name),
XFCE_DICT_SELECTION"%d",
gdk_screen_get_number(gscreen));
- selection_atom = XInternAtom(GDK_DISPLAY(), selection_name, False);
+ selection_atom =
XInternAtom(gdk_x11_display_get_xdisplay(gdk_display_get_default()),
selection_name, False);
- if ((*xid = XGetSelectionOwner(GDK_DISPLAY(), selection_atom)))
+ if ((*xid =
XGetSelectionOwner(gdk_x11_display_get_xdisplay(gdk_display_get_default()),
selection_atom)))
return TRUE;
return FALSE;
--
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
[Xfce4-commits] [apps/xfce4-dict] 20/43: Drop alignment and replace gtk_vseparator_new by gtk_separator_new
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit ec3535c8e1a9336e646d73a109b6742e50e0f621
Author: Andre Miranda
Date: Wed Jul 20 23:13:13 2016 -0300
Drop alignment and replace gtk_vseparator_new by gtk_separator_new
---
lib/gui.c | 11 ++-
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index f884cab..afb125a 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -793,14 +793,7 @@ void dict_gui_create_main_window(DictData *dd)
update_search_button(dd, entry_box);
- /* just make some space */
- align = gtk_alignment_new(1, 0.5, 0, 0);
- gtk_alignment_set_padding(GTK_ALIGNMENT(align), 0, 0, 10, 0);
- gtk_widget_show(align);
- gtk_container_add(GTK_CONTAINER(align), gtk_label_new(""));
- gtk_box_pack_start(GTK_BOX(entry_box), align, FALSE, FALSE, 5);
-
- sep = gtk_vseparator_new();
+ sep = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
gtk_widget_show(sep);
gtk_box_pack_start(GTK_BOX(entry_box), sep, FALSE, FALSE, 2);
@@ -811,7 +804,7 @@ void dict_gui_create_main_window(DictData *dd)
gtk_widget_show(button);
gtk_box_pack_start(GTK_BOX(entry_box), button, FALSE, FALSE, 2);
- sep = gtk_vseparator_new();
+ sep = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
gtk_widget_show(sep);
gtk_box_pack_start(GTK_BOX(entry_box), sep, FALSE, FALSE, 2);
--
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
[Xfce4-commits] [apps/xfce4-dict] 02/43: Replace GdkColor by GdkRGBA
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 3fe58a7a4627d30bd470c7104d74f251978399bf
Author: Andre Miranda
Date: Tue Jun 21 22:58:49 2016 -0300
Replace GdkColor by GdkRGBA
---
lib/common.c | 39 ---
lib/common.h | 8
lib/prefs.c | 8
3 files changed, 20 insertions(+), 35 deletions(-)
diff --git a/lib/common.c b/lib/common.c
index e80b051..259202e 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -314,21 +314,6 @@ static gdouble scale_round(gdouble val, gdouble factor)
}
-static gchar *get_hex_from_color(GdkColor *color)
-{
- gchar *buffer = g_malloc0(9);
-
- g_return_val_if_fail(color != NULL, NULL);
-
- g_snprintf(buffer, 8, "#%02X%02X%02X",
- (guint) (scale_round(color->red / 256, 255)),
- (guint) (scale_round(color->green / 256, 255)),
- (guint) (scale_round(color->blue / 256, 255)));
-
- return buffer;
-}
-
-
static gchar *get_spell_program(void)
{
gchar *path;
@@ -450,14 +435,14 @@ void dict_read_rc_file(DictData *dd)
else
dd->spell_dictionary = spell_dictionary_default;
- dd->color_link = g_new0(GdkColor, 1);
- gdk_color_parse(link_color_str, dd->color_link);
- dd->color_phonetic = g_new0(GdkColor, 1);
- gdk_color_parse(phon_color_str, dd->color_phonetic);
- dd->color_incorrect = g_new0(GdkColor, 1);
- gdk_color_parse(error_color_str, dd->color_incorrect);
- dd->color_correct = g_new0(GdkColor, 1);
- gdk_color_parse(success_color_str, dd->color_correct);
+ dd->color_link = g_new0(GdkRGBA, 1);
+ gdk_rgba_parse(dd->color_link, link_color_str);
+ dd->color_phonetic = g_new0(GdkRGBA, 1);
+ gdk_rgba_parse(dd->color_phonetic, phon_color_str);
+ dd->color_incorrect = g_new0(GdkRGBA, 1);
+ gdk_rgba_parse(dd->color_incorrect, error_color_str);
+ dd->color_correct = g_new0(GdkRGBA, 1);
+ gdk_rgba_parse(dd->color_correct, success_color_str);
dd->speedreader_mark_paragraphs = mark_paragraphs;
dd->speedreader_wpm = wpm;
@@ -489,10 +474,10 @@ void dict_write_rc_file(DictData *dd)
xfce_rc_write_entry(rc, "spell_bin", dd->spell_bin);
xfce_rc_write_entry(rc, "spell_dictionary",
dd->spell_dictionary);
- link_color_str = get_hex_from_color(dd->color_link);
- phon_color_str = get_hex_from_color(dd->color_phonetic);
- error_color_str = get_hex_from_color(dd->color_incorrect);
- success_color_str = get_hex_from_color(dd->color_correct);
+ link_color_str = gdk_rgba_to_string(dd->color_link);
+ phon_color_str = gdk_rgba_to_string(dd->color_phonetic);
+ error_color_str = gdk_rgba_to_string(dd->color_incorrect);
+ success_color_str = gdk_rgba_to_string(dd->color_correct);
xfce_rc_write_entry(rc, "link_color", link_color_str);
xfce_rc_write_entry(rc, "phonetic_color", phon_color_str);
xfce_rc_write_entry(rc, "error_color", error_color_str);
diff --git a/lib/common.h b/lib/common.h
index 2525b66..089eae4 100644
--- a/lib/common.h
+++ b/lib/common.h
@@ -110,10 +110,10 @@ typedef struct
GtkTextMark *mark_click;
GdkPixbuf *icon;
- GdkColor *color_link;
- GdkColor *color_phonetic;
- GdkColor *color_correct;
- GdkColor *color_incorrect;
+ GdkRGBA *color_link;
+ GdkRGBA *color_phonetic;
+ GdkRGBA *color_correct;
+ GdkRGBA *color_incorrect;
/* speed reader */
gint speedreader_wpm;
diff --git a/lib/prefs.c b/lib/prefs.c
index d321bba..d8bc6dd 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -352,10 +352,10 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
label2 = gtk_label_new(_("Phonetics:"));
label3 = gtk_label_new(_("Spelled correctly:"));
label4 = gtk_label_new(_("Spelled incorrectly:"));
- color_link = gtk_color_button_new_with_color(dd->color_link);
- color_phon =
gtk_color_button_new_with_color(dd->color_phonetic);
- color_error =
gtk_color_button_new_with_color(dd->color_incorrect);
- color_success =
gtk_color_button_new_with_color(dd->color_correct);
+ color_link = gtk_color_button_new_with_rgba(dd->color_link);
+ color_phon = gtk_color_button_new_with_rgba(dd->color_phonetic);
+ color_error =
gtk_color_button_new_with_rgba(dd->color_incorrect);
+ color_success =
gtk_color_button_new_with_rgba(dd->color_correct);
g_signal_connect(color_link, "color-set",
G_CALLBACK(color_set_cb), dd->color_link);
g_signal_connect(color_phon, "color-set",
G_CALLBACK(color_set_cb), d
[Xfce4-commits] [apps/xfce4-dict] branch master updated (b923cfb -> 84987e9)
This is an automated email from the git hooks/post-receive script. andre pushed a change to branch master in repository apps/xfce4-dict. from b923cfb I18n: Update translation ca (100%). new 0856532 Bump dependencies to check for gtk3/libxfce4ui-2/libxfce4panel-2.0 new 3fe58a7 Replace GdkColor by GdkRGBA new cb271ea Set X-XFCE-API=2.0 in desktop file new e5aa9e0 Use GtkBox instead of GtkHBox/GtkVBox new aaf064f Use GtkGrid instead of GtkTable new 7ea47fc Replace remaining GdkColor by GdkRGBA new 3d86504 Use gtk_widget_set_halign/valign instead of gtk_misc_set_alignment() new 264ed9b Replace GtkStock by GtkImage new 4d8aa2b Remove compat code for panel < 4.9 and GTK <=2 new 6310616 Stop poking at widget internals, use accessors new 62dcaad Replace g_thread_create by g_thread_new new 7aad05b Replace GDK_[key] by GDK_KEY_[key] new b983044 Replace gdk_window_get_pointer by gdk_window_get_device_position new b7add77 Drop gtk_dialog_set_has_separator new aff0f77 Replace more occurrences of GtkStock by GtkImage new 72c6272 Replace gtk_widget_modify_font by gtk_widget_override_font/GtkStyleContext new 38d955c Drop GTK_DIALOG_NO_SEPARATOR new b0805bb Replace macros by functions new d33c20a Replace gdk_cursor_new by gdk_cursor_new_from_name new ec3535c Drop alignment and replace gtk_vseparator_new by gtk_separator_new new 5433451 Rework menus preserving icons new 52f2960 Replace gdk_spawn_on_screen by g_spawn_async new 5dde15c Replace gdk_cursor_unref by g_object_unref new 8dfb917 Remove GtkTooltips new 2d26c5c Replace gtk_combo_box_* by gtk_combo_box_text* new 02d7c23 Replace macros by functions new d3a9568 Fix server information dialog new 915da4b Fix server information button new ec81b77 Replace GtkWidgetClass::size_request by get_preferred_width/height new a557218 Replace Gtk Pixbuf Inline by Resource new 16a6552 Remove dangling function new 0f20bd4 Fix build new 5176ec9 Make speedreader intro visible new 1960bf3 Remove unnecessary code from About dialog new 7448b14 Fix drag and drop internal data access new 07b6a3c Increment copyright year new 4600333 Use GtkSearchEntry instead of GtkEntry new aa47ee8 Using gdbus as IPC mechanism new 7b68a0e Bumping GTK version new ba40f5e Fixing a couple of warnings new cc98104 Change build order for dbus.c new 92ca401 Set main entry text from IPC calls new 84987e9 Merge branch 'gtk3' The 43 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore| 4 + Makefile.am | 4 +- configure.ac.in | 13 +- lib/Makefile.am | 30 ++- lib/common.c | 119 - lib/common.h | 15 +- lib/dbus.xml | 8 + lib/dictd.c | 20 +- lib/gui.c | 225 ++-- lib/gui.h | 1 - lib/inline-icon.h | 420 -- lib/libdict.h | 1 + lib/prefs.c | 293 + lib/resources.xml | 6 + lib/speedreader.c | 90 --- lib/spell.c | 14 +- lib/wraplabel.c | 25 +- panel-plugin/xfce4-dict-plugin.c | 169 +++- panel-plugin/xfce4-dict-plugin.desktop.in | 2 +- xfce4-dict.svg => pixmaps/xfce4-dict.svg | 0 src/popup_plugin.c| 71 ++--- src/xfce4-dict.c | 8 +- 22 files changed, 520 insertions(+), 1018 deletions(-) create mode 100644 lib/dbus.xml delete mode 100644 lib/inline-icon.h create mode 100644 lib/resources.xml rename xfce4-dict.svg => pixmaps/xfce4-dict.svg (100%) -- 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
[Xfce4-commits] [apps/xfce4-dict] 05/43: Use GtkGrid instead of GtkTable
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit aaf064f50656a16ef4841917afec281e5c69eb7d
Author: Andre Miranda
Date: Tue Jun 21 23:20:43 2016 -0300
Use GtkGrid instead of GtkTable
---
lib/prefs.c | 207 +---
1 file changed, 86 insertions(+), 121 deletions(-)
diff --git a/lib/prefs.c b/lib/prefs.c
index 2ff5e46..5f3d950 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -168,11 +168,11 @@ static GtkWidget *create_web_dicts_table(GtkWidget *entry)
{
gint i;
gint offset;
- GtkWidget *table, *button;
+ GtkWidget *grid, *button;
- table = gtk_table_new(4, 2, FALSE);
- gtk_table_set_row_spacings(GTK_TABLE(table), 2);
- gtk_table_set_col_spacings(GTK_TABLE(table), 2);
+ grid = gtk_grid_new();
+ gtk_grid_set_row_spacing(GTK_GRID(grid), 4);
+ gtk_grid_set_column_spacing(GTK_GRID(grid), 4);
for (i = 0; web_dicts[i].label != NULL; i++)
{
@@ -182,13 +182,11 @@ static GtkWidget *create_web_dicts_table(GtkWidget *entry)
g_object_set_data(G_OBJECT(button), "web_entry", entry);
gtk_widget_show(button);
- gtk_table_attach(GTK_TABLE(table),
- button, offset, 1 + offset, i - offset, i + 1 -
offset,
- (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
- (GtkAttachOptions) (0), 5, 5);
+ gtk_grid_attach(GTK_GRID(grid), button, offset, i - offset, 1,
1);
+ gtk_widget_set_hexpand(button, TRUE);
}
- return table;
+ return grid;
}
@@ -288,7 +286,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
*/
#define PAGE_GENERAL /* only for navigation in Geany's symbol list ;-) */
{
- GtkWidget *radio_button, *label, *table, *label4;
+ GtkWidget *radio_button, *label, *grid, *label4;
GtkWidget *color_link, *color_phon, *color_success,
*color_error;
GSList *search_method;
@@ -361,49 +359,40 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
g_signal_connect(color_error, "color-set",
G_CALLBACK(color_set_cb), dd->color_incorrect);
g_signal_connect(color_success, "color-set",
G_CALLBACK(color_set_cb), dd->color_correct);
- table = gtk_table_new(2, 4, FALSE);
- gtk_widget_show(table);
- gtk_table_set_row_spacings(GTK_TABLE(table), 5);
- gtk_table_set_col_spacings(GTK_TABLE(table), 5);
+ grid = gtk_grid_new();
+ gtk_grid_set_row_spacing(GTK_GRID(grid), 8);
+ gtk_grid_set_column_spacing(GTK_GRID(grid), 8);
- gtk_table_attach(GTK_TABLE(table), label1, 0, 1, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 5, 5);
- gtk_misc_set_alignment(GTK_MISC(label1), 1, 0);
+ gtk_grid_attach(GTK_GRID(grid), label1, 0, 0, 1, 1);
+ gtk_widget_set_valign (label1, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (label1, GTK_ALIGN_END);
- gtk_table_attach(GTK_TABLE(table), color_link, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_FILL |
GTK_EXPAND),
- (GtkAttachOptions) (0), 5, 5);
+ gtk_grid_attach(GTK_GRID(grid), color_link, 1, 0, 1, 1);
+ gtk_widget_set_hexpand(color_link, TRUE);
- gtk_table_attach(GTK_TABLE(table), label2, 0, 1, 1, 2,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 5, 0);
- gtk_misc_set_alignment(GTK_MISC(label2), 1, 0);
+ gtk_grid_attach(GTK_GRID(grid), label2, 0, 1, 1, 1);
+ gtk_widget_set_valign (label2, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign (label2, GTK_ALIGN_END);
- gtk_table_attach(GTK_TABLE(table), color_phon, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_FILL |
GTK_EXPAND),
- (GtkAttachOptions) (0), 5, 5);
+ gtk_grid_attach(GTK_GRID(grid), color_phon, 1, 1, 1, 1);
+ gtk_widget_set_hexpand(color_phon, TRUE);
- gtk_table_attach(GTK_TABLE(table), label3, 2, 3, 0, 1,
- (GtkAttachOptions) (GTK_FILL),
- (GtkAttachOptions) (0), 5, 5);
- gtk_misc_set_alignment(GTK_MISC(label3), 1, 0);
+ gtk_grid_attach(GTK_GRID(grid), label3, 2, 0, 1,
[Xfce4-commits] [apps/xfce4-dict] 03/43: Set X-XFCE-API=2.0 in desktop file
This is an automated email from the git hooks/post-receive script. andre pushed a commit to branch master in repository apps/xfce4-dict. commit cb271eaf8fba926603e49b9dfa69977f0a7ce5de Author: Andre Miranda Date: Tue Jun 21 22:59:23 2016 -0300 Set X-XFCE-API=2.0 in desktop file --- panel-plugin/xfce4-dict-plugin.desktop.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panel-plugin/xfce4-dict-plugin.desktop.in b/panel-plugin/xfce4-dict-plugin.desktop.in index 4965a14..7404c55 100644 --- a/panel-plugin/xfce4-dict-plugin.desktop.in +++ b/panel-plugin/xfce4-dict-plugin.desktop.in @@ -6,4 +6,4 @@ _Comment=A plugin to query different dictionaries. Icon=xfce4-dict X-XFCE-Module=xfce4dict X-XFCE-Internal=false - +X-XFCE-API=2.0 -- 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
[Xfce4-commits] [apps/xfce4-dict] 12/43: Replace GDK_[key] by GDK_KEY_[key]
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 7aad05bcaa206aa1c619ab24e2db829a28d5b2b8
Author: Andre Miranda
Date: Wed Jul 20 22:54:04 2016 -0300
Replace GDK_[key] by GDK_KEY_[key]
---
lib/gui.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/gui.c b/lib/gui.c
index 86a63b4..c3d9863 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -120,8 +120,8 @@ static gboolean textview_key_press_event(GtkWidget
*text_view, GdkEventKey *even
switch (event->keyval)
{
- case GDK_Return:
- case GDK_KP_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_KP_Enter:
{
gtk_text_buffer_get_iter_at_mark(dd->main_textbuffer,
&iter,
gtk_text_buffer_get_insert(dd->main_textbuffer));
@@ -923,7 +923,7 @@ void dict_gui_create_main_window(DictData *dd)
gtk_window_maximize(GTK_WINDOW(dd->window));
}
/* quit on Escape */
- gtk_widget_add_accelerator(dd->close_button, "clicked", accel_group,
GDK_Escape, 0, 0);
+ gtk_widget_add_accelerator(dd->close_button, "clicked", accel_group,
GDK_KEY_Escape, 0, 0);
gtk_window_add_accel_group(GTK_WINDOW(dd->window), accel_group);
}
--
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
[Xfce4-commits] [apps/xfce4-dict] 10/43: Stop poking at widget internals, use accessors
This is an automated email from the git hooks/post-receive script.
andre pushed a commit to branch master
in repository apps/xfce4-dict.
commit 63106163ccab2c6cd8d7347863aa8bef0c89e54c
Author: Andre Miranda
Date: Wed Jul 20 22:47:52 2016 -0300
Stop poking at widget internals, use accessors
---
lib/dictd.c | 4 ++--
lib/gui.c| 2 +-
lib/prefs.c | 2 +-
lib/speedreader.c| 4 ++--
panel-plugin/xfce4-dict-plugin.c | 8
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lib/dictd.c b/lib/dictd.c
index 28f5451..8c75cbf 100644
--- a/lib/dictd.c
+++ b/lib/dictd.c
@@ -650,7 +650,7 @@ static void signal_cb(gint sig)
}
-static void dictd_init()
+static void dictd_init(void)
{
#ifdef SIGALRM
static gboolean initialized = FALSE;
@@ -753,7 +753,7 @@ void dict_dictd_get_information(GtkWidget *button, DictData
*dd)
"gtk-close", GTK_RESPONSE_CLOSE, NULL);
vbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
+ gtk_container_add(GTK_CONTAINER (gtk_dialog_get_content_area
(GTK_DIALOG (dialog))), vbox);
gtk_box_set_spacing(GTK_BOX(vbox), 6);
g_free(text);
diff --git a/lib/gui.c b/lib/gui.c
index 1c826e1..86a63b4 100644
--- a/lib/gui.c
+++ b/lib/gui.c
@@ -977,7 +977,7 @@ void dict_gui_query_geometry(DictData *dd)
gtk_window_get_position(GTK_WINDOW(dd->window), &dd->geometry[0],
&dd->geometry[1]);
gtk_window_get_size(GTK_WINDOW(dd->window), &dd->geometry[2],
&dd->geometry[3]);
- if (gdk_window_get_state(dd->window->window) &
GDK_WINDOW_STATE_MAXIMIZED)
+ if (gdk_window_get_state(gtk_widget_get_window(dd->window)) &
GDK_WINDOW_STATE_MAXIMIZED)
dd->geometry[4] = 1;
else
dd->geometry[4] = 0;
diff --git a/lib/prefs.c b/lib/prefs.c
index 9aad6c5..25c7cb3 100644
--- a/lib/prefs.c
+++ b/lib/prefs.c
@@ -278,7 +278,7 @@ GtkWidget *dict_prefs_dialog_show(GtkWidget *parent,
DictData *dd)
GTK_WIDGET_UNSET_FLAGS(notebook, GTK_CAN_FOCUS);
gtk_widget_show(notebook);
g_object_set_data(G_OBJECT(dialog), "notebook", notebook);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), notebook, FALSE,
TRUE, 0);
+
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
notebook, FALSE, TRUE, 0);
gtk_container_set_border_width(GTK_CONTAINER(notebook), 5);
/*
diff --git a/lib/speedreader.c b/lib/speedreader.c
index dc68391..9c3bd61 100644
--- a/lib/speedreader.c
+++ b/lib/speedreader.c
@@ -708,8 +708,8 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog)
gtk_widget_grab_focus(textview);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), priv->first_page,
TRUE, TRUE, 6);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
priv->second_page, TRUE, TRUE, 6);
+
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
priv->first_page, TRUE, TRUE, 6);
+
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
priv->second_page, TRUE, TRUE, 6);
xfd_speed_reader_set_window_title(dialog, XSR_STATE_INITIAL);
}
diff --git a/panel-plugin/xfce4-dict-plugin.c b/panel-plugin/xfce4-dict-plugin.c
index 6ba3cee..b137292 100644
--- a/panel-plugin/xfce4-dict-plugin.c
+++ b/panel-plugin/xfce4-dict-plugin.c
@@ -184,7 +184,7 @@ static gboolean dict_plugin_set_selection(DictPanelData
*dpd)
win = gtk_invisible_new();
gtk_widget_realize(win);
- xwin = GDK_WINDOW_XID(GTK_WIDGET(win)->window);
+ xwin = GDK_WINDOW_XID(gtk_widget_get_window (GTK_WIDGET(win)));
gscreen = gtk_widget_get_screen(win);
g_snprintf(selection_name, sizeof (selection_name),
@@ -334,7 +334,7 @@ static gboolean entry_buttonpress_cb(GtkWidget *entry,
GdkEventButton *event, Di
toplevel = gtk_widget_get_toplevel(entry);
/* Grab entry focus if possible */
- if (event->button != 3 && toplevel && toplevel->window)
+ if (event->button != 3 && toplevel && gtk_widget_get_window (toplevel))
xfce_panel_plugin_focus_widget(dpd->plugin, entry);
return FALSE;
@@ -350,11 +350,11 @@ static void entry_changed_cb(GtkEditable *editable,
DictPanelData *dpd)
static void dict_plugin_drag_data_received(GtkWidget *widget, GdkDragContext
*drag_context,
gint x, gint y, GtkSelectionData *data, guint info, guint
ltime, DictPanelData *dpd)
{
- if ((data != NULL) && (data->length >= 0) && (data->format == 8))
+ if ((data != NULL) && (gtk_selection_data_get_length(data) >= 0) &&
(gtk_selection_data_get_format(data) == 8))
{
if (widget == dpd->panel_button || widget ==
dpd->dd->panel_ent
[Xfce4-commits] [apps/xfce4-dict] 01/43: Bump dependencies to check for gtk3/libxfce4ui-2/libxfce4panel-2.0
This is an automated email from the git hooks/post-receive script. andre pushed a commit to branch master in repository apps/xfce4-dict. commit 08565322bbcc3f4d1b2ce4f2280f627ffc81a2a4 Author: Andre Miranda Date: Tue Jun 21 22:52:21 2016 -0300 Bump dependencies to check for gtk3/libxfce4ui-2/libxfce4panel-2.0 --- configure.ac.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 7061c2d..e4b7a59 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -54,10 +54,10 @@ dnl *** dnl *** Check for required packages *** dnl *** XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.14.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) -XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0]) +XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.10.0]) XDT_CHECK_PACKAGE([X11], [x11]) dnl *** -- 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
[Xfce4-commits] [apps/xfce4-dict] 14/43: Drop gtk_dialog_set_has_separator
This is an automated email from the git hooks/post-receive script. andre pushed a commit to branch master in repository apps/xfce4-dict. commit b7add77d0596c47bc59a043a1a4d757f70d5e15b Author: Andre Miranda Date: Wed Jul 20 22:57:26 2016 -0300 Drop gtk_dialog_set_has_separator --- lib/speedreader.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/speedreader.c b/lib/speedreader.c index 9c3bd61..025845d 100644 --- a/lib/speedreader.c +++ b/lib/speedreader.c @@ -580,7 +580,6 @@ static void xfd_speed_reader_init(XfdSpeedReader *dialog) gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE); gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 330); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE); - gtk_dialog_set_has_separator(GTK_DIALOG(dialog), FALSE); gtk_widget_set_name(GTK_WIDGET(dialog), "Xfce4Dict"); /* First page */ -- 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
[Xfce4-commits] [apps/gigolo] 24/35: remove now unused function
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 215439732d3acc2355f3f40aa284fe08a012415c
Author: Landry Breuil
Date: Sun Jun 19 16:58:52 2016 +0200
remove now unused function
---
src/window.c | 7 ---
1 file changed, 7 deletions(-)
diff --git a/src/window.c b/src/window.c
index 990d26e..7263054 100644
--- a/src/window.c
+++ b/src/window.c
@@ -410,13 +410,6 @@ static void action_bookmark_edit_cb(G_GNUC_UNUSED
GtkAction *action, GigoloWindo
}
-static void about_activate_link(G_GNUC_UNUSED GtkAboutDialog *dialog,
- const gchar
*uri, G_GNUC_UNUSED gpointer data)
-{
- gigolo_show_uri(uri);
-}
-
-
static void action_about_cb(G_GNUC_UNUSED GtkAction *action, GigoloWindow
*window)
{
const gchar *authors[]= { "Enrico Tröger ", NULL };
--
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
[Xfce4-commits] [apps/gigolo] 22/35: Migrate from GtkHSeparator to GtkSeparator
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit a0548e3ecd7e3a69443a1961a6664b9c18b1fd29
Author: Landry Breuil
Date: Sun Jun 19 16:58:02 2016 +0200
Migrate from GtkHSeparator to GtkSeparator
---
src/bookmarkeditdialog.c | 2 +-
src/preferencesdialog.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 7f6fd68..063bd5a 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -1058,7 +1058,7 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
gtk_label_set_mnemonic_widget(GTK_LABEL(priv->autoconnect_label),
priv->autoconnect_checkbtn);
gtk_table_attach(GTK_TABLE(table), priv->autoconnect_checkbtn, 1, 2, 2,
3, GTK_FILL, GTK_FILL, 0, 0);
- priv->separator = gtk_hseparator_new();
+ priv->separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
gtk_table_attach(GTK_TABLE(table), priv->separator, 0, 2, 3, 4,
GTK_FILL, GTK_FILL, 0, 0);
label = gtk_label_new_with_mnemonic(_("Service t_ype:"));
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index f44a896..65dad12 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -77,7 +77,7 @@ static GtkWidget *xfce_header_new(const gchar *icon, const
gchar *title)
vbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), xfce_heading, FALSE, FALSE, 0);
- separator = gtk_hseparator_new();
+ separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL);
gtk_box_pack_start(GTK_BOX(vbox), separator, FALSE, FALSE, 0);
return vbox;
--
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
[Xfce4-commits] [apps/gigolo] 29/35: ensure the treeview expands in width
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit dd0e669bfd2df91ccad081f4a3c4fdf1a6b70a38 Author: Landry Breuil Date: Sun Jun 19 18:03:34 2016 +0200 ensure the treeview expands in width --- src/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/window.c b/src/window.c index 2de0f58..1d4b12d 100644 --- a/src/window.c +++ b/src/window.c @@ -1556,6 +1556,7 @@ static void gigolo_window_init(GigoloWindow *window) create_icon_view(window); priv->swin_treeview = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_set_hexpand(GTK_WIDGET(priv->swin_treeview), TRUE); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(priv->swin_treeview), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(priv->swin_treeview), GTK_SHADOW_IN); -- 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
[Xfce4-commits] [apps/gigolo] 11/35: Tentative migration from handrolled GigoloSingleInstance to GtkApplication
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 6f421a3cb376026c12b128a399062aa65b330996
Author: Landry Breuil
Date: Fri Jun 17 22:49:04 2016 +0200
Tentative migration from handrolled GigoloSingleInstance to GtkApplication
Warning, this only builds, but doesn't actually work!
To be revisited soon...
---
src/main.c | 20 +++-
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main.c b/src/main.c
index 3a3b705..4b23c9b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -96,11 +96,18 @@ static void print_supported_schemes(void)
}
}
+static void activate (GApplication *app, gpointer user_data)
+{
+ GtkWidget *widget;
+
+ widget = gtk_application_window_new (GTK_APPLICATION (app));
+ gtk_widget_show (widget);
+}
gint main(gint argc, gchar** argv)
{
GigoloSettings *settings;
- GigoloSingleInstance *gis = NULL;
+ GtkApplication *gis = NULL;
gchar *accel_filename;
GOptionContext *context;
GtkWidget *window;
@@ -144,13 +151,8 @@ gint main(gint argc, gchar** argv)
if (! new_instance)
{
- gis = gigolo_single_instance_new();
- if (gigolo_single_instance_is_running(gis))
- {
- gigolo_single_instance_present(gis);
- g_object_unref(gis);
- exit(0);
- }
+ gis = gtk_application_new("org.xfce.gigolo",
G_APPLICATION_FLAGS_NONE);
+ g_signal_connect (gis, "activate", G_CALLBACK (activate), NULL);
}
verbose("Gigolo %s (GTK+ %u.%u.%u, GLib %u.%u.%u)",
@@ -166,7 +168,7 @@ gint main(gint argc, gchar** argv)
window = gigolo_window_new(settings);
if (gis != NULL)
- gigolo_single_instance_set_parent(gis, GTK_WINDOW(window));
+ gtk_application_add_window(gis, GTK_WINDOW(window));
if (gigolo_settings_get_boolean(settings, "start-in-systray") &&
gigolo_settings_get_boolean(settings, "show-in-systray"))
--
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
[Xfce4-commits] [apps/gigolo] 08/35: Use modern GDK_KEY defines
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit d0477b6027600969bece6e90a671ded54ec4072f
Author: Landry Breuil
Date: Fri Jun 17 22:46:53 2016 +0200
Use modern GDK_KEY defines
---
src/browsenetworkpanel.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c
index c11d082..8a8c7d8 100644
--- a/src/browsenetworkpanel.c
+++ b/src/browsenetworkpanel.c
@@ -261,10 +261,10 @@ static void button_close_click_cb(G_GNUC_UNUSED
GtkToolButton *btn, GigoloBrowse
static gboolean tree_key_press_event(G_GNUC_UNUSED GtkWidget *widget,
GdkEventKey *event,
GigoloBrowseNetworkPanel *panel)
{
- if (event->keyval == GDK_Return ||
- event->keyval == GDK_ISO_Enter ||
- event->keyval == GDK_KP_Enter ||
- event->keyval == GDK_space)
+ if (event->keyval == GDK_KEY_Return ||
+ event->keyval == GDK_KEY_ISO_Enter ||
+ event->keyval == GDK_KEY_KP_Enter ||
+ event->keyval == GDK_KEY_space)
{
mount_share(panel, GIGOLO_BE_MODE_CONNECT);
return TRUE;
--
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
[Xfce4-commits] [apps/gigolo] 16/35: Migrate from GtkHBox/GtkVBox to GtkBox
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 50bf2aea0e5cd79b77d71ef0d32ac8f0738e8e0c
Author: Landry Breuil
Date: Sat Jun 18 16:17:25 2016 +0200
Migrate from GtkHBox/GtkVBox to GtkBox
---
src/bookmarkdialog.c | 4 ++--
src/bookmarkeditdialog.c | 4 ++--
src/mountdialog.c| 2 +-
src/preferencesdialog.c | 28 ++--
src/window.c | 6 +++---
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c
index 152d2b9..0b68770 100644
--- a/src/bookmarkdialog.c
+++ b/src/bookmarkdialog.c
@@ -429,7 +429,7 @@ static void
gigolo_bookmark_dialog_init(GigoloBookmarkDialog *dialog)
priv->button_delete = gtk_button_new_from_stock("gtk-delete");
g_signal_connect(priv->button_delete, "clicked",
G_CALLBACK(delete_button_click_cb), dialog);
- hbox = gtk_hbox_new(FALSE, 10);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
gtk_box_pack_start(GTK_BOX(hbox), button_add, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), priv->button_edit, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), priv->button_delete, FALSE, FALSE, 0);
@@ -442,7 +442,7 @@ static void
gigolo_bookmark_dialog_init(GigoloBookmarkDialog *dialog)
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(swin),
GTK_SHADOW_IN);
gtk_container_add(GTK_CONTAINER(swin), priv->tree);
- vbox2 = gtk_vbox_new(FALSE, 6);
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_box_pack_start(GTK_BOX(vbox2), swin, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox2), hbox, FALSE, FALSE, 0);
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 031b6d4..2638f7a 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -1018,12 +1018,12 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
- vbox = gtk_vbox_new(FALSE, 6);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 6);
gtk_container_set_border_width(GTK_CONTAINER (vbox), 5);
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
vbox, FALSE, TRUE, 0);
- hbox = gtk_hbox_new(FALSE, 6);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
priv->table = table = gtk_table_new(9, 3, FALSE);
diff --git a/src/mountdialog.c b/src/mountdialog.c
index fb59d14..3c0a8a2 100644
--- a/src/mountdialog.c
+++ b/src/mountdialog.c
@@ -99,7 +99,7 @@ static void gigolo_mount_dialog_init(GigoloMountDialog *self)
gtk_window_set_default_size(GTK_WINDOW(self), 200, -1);
gtk_window_set_title(GTK_WINDOW(self), _("Connecting"));
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(self))),
vbox);
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index 5c8dc89..f85b44e 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -61,7 +61,7 @@ static GtkWidget *xfce_header_new(const gchar *icon, const
gchar *title)
xfce_heading = gtk_event_box_new();
entry = gtk_entry_new();
- hbox = gtk_hbox_new(FALSE, 12);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width(GTK_CONTAINER(hbox), 6);
image = gtk_image_new_from_icon_name(icon, GTK_ICON_SIZE_DIALOG);
gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0);
@@ -74,7 +74,7 @@ static GtkWidget *xfce_header_new(const gchar *icon, const
gchar *title)
gtk_widget_destroy(entry);
- vbox = gtk_vbox_new(FALSE, 0);
+ vbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start(GTK_BOX(vbox), xfce_heading, FALSE, FALSE, 0);
separator = gtk_hseparator_new();
@@ -325,13 +325,13 @@ static void set_settings(GigoloPreferencesDialog *dialog,
GigoloSettings *settin
gtk_container_set_border_width(GTK_CONTAINER(notebook), 5);
#define PAGE_GENERAL
- notebook_vbox = gtk_vbox_new(FALSE, 2);
- frame_vbox = gtk_vbox_new(FALSE, 5);
+ notebook_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 2);
+ frame_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width(GTK_CONTAINER(frame_vbox), 5);
gtk_box_pack_start(GTK_BOX(notebook_vbox), frame_vbox, TRUE, TRUE, 5);
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), notebook_vbox,
gtk_label_new(_("General")));
- hbox = gtk_hbox_new(FALSE, 6);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
gtk_box_pack_start(GTK_BOX(f
[Xfce4-commits] [apps/gigolo] 26/35: Migrate to newer GdkCursor constructor
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit b7b393927970616a4e90024ac02decb8c6c28377 Author: Landry Breuil Date: Sun Jun 19 17:15:13 2016 +0200 Migrate to newer GdkCursor constructor --- src/browsenetworkpanel.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c index 4c2756a..ed3e763 100644 --- a/src/browsenetworkpanel.c +++ b/src/browsenetworkpanel.c @@ -76,7 +76,7 @@ static void gigolo_browse_network_panel_finalize(GObject *object) GigoloBackendGVFS *backend; gtk_widget_destroy(priv->popup_menu); - gdk_cursor_unref(priv->wait_cursor); + g_object_unref(priv->wait_cursor); backend = gigolo_window_get_backend(priv->parent); if (backend != NULL && IS_GIGOLO_BACKEND_GVFS(backend) && priv->browse_network_signal_id > 0) @@ -533,7 +533,7 @@ static void gigolo_browse_network_panel_init(GigoloBrowseNetworkPanel *panel) gtk_widget_show_all(toolbar); gtk_widget_show_all(swin); - priv->wait_cursor = gdk_cursor_new(GDK_WATCH); + priv->wait_cursor = gdk_cursor_new_for_display(gdk_display_get_default(), GDK_WATCH); g_signal_connect_after(panel, "realize", G_CALLBACK(realize_cb), NULL); } -- 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
[Xfce4-commits] [apps/gigolo] 30/35: Oops, wrong box orientation for preferences dialog
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit 4ad4e6eab8ac28839190c01823f3e5b931fcab89 Author: Landry Breuil Date: Mon Jun 20 21:12:00 2016 +0200 Oops, wrong box orientation for preferences dialog --- src/preferencesdialog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c index 12a418c..fb14701 100644 --- a/src/preferencesdialog.c +++ b/src/preferencesdialog.c @@ -74,7 +74,7 @@ static GtkWidget *xfce_header_new(const gchar *icon, const gchar *title) gtk_widget_destroy(entry); - vbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); + vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start(GTK_BOX(vbox), xfce_heading, FALSE, FALSE, 0); separator = gtk_separator_new(GTK_ORIENTATION_HORIZONTAL); -- 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
[Xfce4-commits] [apps/gigolo] 20/35: use proper macro
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 4c837c894db20de47098a4e69b0ea0ccd22d685a
Author: Landry Breuil
Date: Sun Jun 19 16:39:02 2016 +0200
use proper macro
---
src/bookmarkeditdialog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index d7a4057..4b3d46f 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -945,7 +945,7 @@ static void browse_host_finished_cb(G_GNUC_UNUSED
GigoloBackendGVFS *bnd, GSList
GSList *node;
for (node = shares; node != NULL; node = node->next)
{
-
gtk_combo_box_text_append(GTK_COMBO_BOX(priv->share_combo), NULL, node->data);
+
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(priv->share_combo), NULL,
node->data);
}
gtk_combo_box_set_active(GTK_COMBO_BOX(priv->share_combo), 0);
--
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
[Xfce4-commits] [apps/gigolo] 35/35: Merge remote-tracking branch 'landry/master'
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit 4de50e2a874e53dad9ddc3e40d73fbc6201724eb Merge: 3ea4493 82a5342 Author: Landry Breuil Date: Mon Oct 31 18:15:55 2016 +0100 Merge remote-tracking branch 'landry/master' .gitignore | 25 +- configure.ac.in | 6 +- po/POTFILES.in | 3 - src/Makefile.am | 3 - src/backendgvfs.c| 11 +- src/bookmarkdialog.c | 11 +- src/bookmarkeditdialog.c | 157 ++-- src/bookmarkpanel.c | 13 +- src/browsenetworkpanel.c | 35 +-- src/compat.c | 95 --- src/compat.h | 37 --- src/main.c | 62 +++-- src/mountdialog.c| 18 +- src/mountoperation.c | 631 --- src/mountoperation.h | 51 src/preferencesdialog.c | 76 +++--- src/singleinstance.c | 282 - src/singleinstance.h | 52 src/window.c | 26 +- 19 files changed, 225 insertions(+), 1369 deletions(-) -- 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
[Xfce4-commits] [apps/gigolo] 27/35: More VBox/HPaned conversion
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 2d01a55c0c6f26303fb06b52dff6ba1a3736
Author: Landry Breuil
Date: Sun Jun 19 17:26:56 2016 +0200
More VBox/HPaned conversion
---
src/bookmarkpanel.c | 7 ---
src/window.c| 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/bookmarkpanel.c b/src/bookmarkpanel.c
index 0c4334e..9b4f4fe 100644
--- a/src/bookmarkpanel.c
+++ b/src/bookmarkpanel.c
@@ -55,12 +55,12 @@ enum
struct _GigoloBookmarkPanel
{
- GtkVBox parent;
+ GtkBox parent;
};
struct _GigoloBookmarkPanelClass
{
- GtkVBoxClass parent_class;
+ GtkBoxClass parent_class;
};
struct _GigoloBookmarkPanelPrivate
@@ -73,7 +73,7 @@ struct _GigoloBookmarkPanelPrivate
GtkListStore *store;
};
-G_DEFINE_TYPE(GigoloBookmarkPanel, gigolo_bookmark_panel, GTK_TYPE_VBOX);
+G_DEFINE_TYPE(GigoloBookmarkPanel, gigolo_bookmark_panel, GTK_TYPE_BOX);
@@ -248,6 +248,7 @@ static void gigolo_bookmark_panel_init(GigoloBookmarkPanel
*self)
GtkToolItem *toolitem;
GigoloBookmarkPanelPrivate *priv =
GIGOLO_BOOKMARK_PANEL_GET_PRIVATE(self);
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (self),
GTK_ORIENTATION_VERTICAL);
toolbar = gtk_toolbar_new();
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ);
gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_BUTTON);
diff --git a/src/window.c b/src/window.c
index 7263054..2de0f58 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1480,7 +1480,7 @@ static GtkWidget *gigolo_window_create_panel(GigoloWindow
*window)
GtkWidget *panel_pane, *label;
GigoloWindowPrivate *priv = GIGOLO_WINDOW_GET_PRIVATE(window);
- panel_pane = gtk_hpaned_new();
+ panel_pane = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
gtk_paned_set_position(GTK_PANED(panel_pane), 200);
priv->notebook_panel = gtk_notebook_new();
--
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
[Xfce4-commits] [apps/gigolo] 06/35: Migrate from GtkObject to GObject
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit a0b850a4deae5e60c2bf55381df285e8aac290fb
Author: Landry Breuil
Date: Fri Jun 17 22:45:34 2016 +0200
Migrate from GtkObject to GObject
---
src/bookmarkeditdialog.c | 7 +++
src/mountdialog.c| 10 +-
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index d45a80e..4de244c 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -160,7 +160,7 @@ G_DEFINE_TYPE(GigoloBookmarkEditDialog,
gigolo_bookmark_edit_dialog, GTK_TYPE_DI
-static void gigolo_bookmark_edit_dialog_destroy(GtkObject *object)
+static void gigolo_bookmark_edit_dialog_finalize(GObject *object)
{
GigoloBookmarkEditDialogPrivate *priv =
GIGOLO_BOOKMARK_EDIT_DIALOG_GET_PRIVATE(object);
GigoloBackendGVFS *backend;
@@ -189,7 +189,7 @@ static void gigolo_bookmark_edit_dialog_destroy(GtkObject
*object)
gtk_widget_destroy(priv->share_label);
gtk_widget_destroy(priv->information_label);
-
GTK_OBJECT_CLASS(gigolo_bookmark_edit_dialog_parent_class)->destroy(object);
+
G_OBJECT_CLASS(gigolo_bookmark_edit_dialog_parent_class)->finalize(object);
}
@@ -319,10 +319,9 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
static void
gigolo_bookmark_edit_dialog_class_init(GigoloBookmarkEditDialogClass *klass)
{
- GtkObjectClass *gtk_object_class = (GtkObjectClass *) klass;
GObjectClass *g_object_class = G_OBJECT_CLASS(klass);
- gtk_object_class->destroy = gigolo_bookmark_edit_dialog_destroy;
+ g_object_class->finalize = gigolo_bookmark_edit_dialog_finalize;
g_object_class->set_property = gigolo_bookmark_edit_dialog_set_property;
diff --git a/src/mountdialog.c b/src/mountdialog.c
index c204ca7..250f428 100644
--- a/src/mountdialog.c
+++ b/src/mountdialog.c
@@ -49,7 +49,7 @@ struct _GigoloMountDialogPrivate
guint timer_id;
};
-static void gigolo_mount_dialog_destroy
(GtkObject *widget);
+static void gigolo_mount_dialog_finalize (GObject
*widget);
G_DEFINE_TYPE(GigoloMountDialog, gigolo_mount_dialog, GTK_TYPE_DIALOG);
@@ -58,15 +58,15 @@ G_DEFINE_TYPE(GigoloMountDialog, gigolo_mount_dialog,
GTK_TYPE_DIALOG);
static void gigolo_mount_dialog_class_init(GigoloMountDialogClass *klass)
{
- GtkObjectClass *object_class = GTK_OBJECT_CLASS(klass);
+ GObjectClass *object_class = G_OBJECT_CLASS(klass);
- object_class->destroy = gigolo_mount_dialog_destroy;
+ object_class->finalize = gigolo_mount_dialog_finalize;
g_type_class_add_private(klass, sizeof(GigoloMountDialogPrivate));
}
-static void gigolo_mount_dialog_destroy(GtkObject *widget)
+static void gigolo_mount_dialog_finalize(GObject *widget)
{
GigoloMountDialogPrivate *priv =
GIGOLO_MOUNT_DIALOG_GET_PRIVATE(widget);
@@ -76,7 +76,7 @@ static void gigolo_mount_dialog_destroy(GtkObject *widget)
priv->timer_id = -1;
}
- GTK_OBJECT_CLASS(gigolo_mount_dialog_parent_class)->destroy(widget);
+ G_OBJECT_CLASS(gigolo_mount_dialog_parent_class)->finalize(widget);
}
--
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
[Xfce4-commits] [apps/gigolo] 32/35: Replace gtk_tool_button_new_from_stock by gtk_tool_button_new
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit a0f13a9413b8cb2d5713dcd47536f897d77bda8d
Author: Landry Breuil
Date: Mon Jun 20 21:15:25 2016 +0200
Replace gtk_tool_button_new_from_stock by gtk_tool_button_new
---
src/bookmarkpanel.c | 6 --
src/browsenetworkpanel.c | 6 --
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/bookmarkpanel.c b/src/bookmarkpanel.c
index 9b4f4fe..700ed4e 100644
--- a/src/bookmarkpanel.c
+++ b/src/bookmarkpanel.c
@@ -253,7 +253,8 @@ static void gigolo_bookmark_panel_init(GigoloBookmarkPanel
*self)
gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ);
gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_BUTTON);
- toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_CONNECT);
+ toolitem = gtk_tool_button_new(gtk_image_new_from_icon_name
("gtk-connect",
+ gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar))), NULL);
gtk_widget_set_tooltip_text(GTK_WIDGET(toolitem), _("Connect to the
selected bookmark"));
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
g_signal_connect(toolitem, "clicked",
G_CALLBACK(button_connect_click_cb), self);
@@ -264,7 +265,8 @@ static void gigolo_bookmark_panel_init(GigoloBookmarkPanel
*self)
gtk_tool_item_set_expand(toolitem, TRUE);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
- toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_CLOSE);
+ toolitem = gtk_tool_button_new(gtk_image_new_from_icon_name
("gtk-close",
+ gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar))), NULL);
gtk_widget_set_tooltip_text(GTK_WIDGET(toolitem), _("Close panel"));
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
g_signal_connect(toolitem, "clicked",
G_CALLBACK(button_close_click_cb), self);
diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c
index 1ee51ac..6f6a5ed 100644
--- a/src/browsenetworkpanel.c
+++ b/src/browsenetworkpanel.c
@@ -504,7 +504,8 @@ static void
gigolo_browse_network_panel_init(GigoloBrowseNetworkPanel *panel)
toolitem = gtk_separator_tool_item_new();
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
- toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH);
+ toolitem = gtk_tool_button_new(gtk_image_new_from_icon_name
("gtk-refresh",
+ gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar))), NULL);
gtk_widget_set_tooltip_text(GTK_WIDGET(toolitem), _("Refresh the
network list"));
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
g_signal_connect(toolitem, "clicked",
G_CALLBACK(button_refresh_click_cb), panel);
@@ -515,7 +516,8 @@ static void
gigolo_browse_network_panel_init(GigoloBrowseNetworkPanel *panel)
gtk_tool_item_set_expand(toolitem, TRUE);
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
- toolitem = gtk_tool_button_new_from_stock(GTK_STOCK_CLOSE);
+ toolitem = gtk_tool_button_new(gtk_image_new_from_icon_name
("gtk-close",
+ gtk_toolbar_get_icon_size(GTK_TOOLBAR(toolbar))), NULL);
gtk_widget_set_tooltip_text(GTK_WIDGET(toolitem), _("Close panel"));
gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
g_signal_connect(toolitem, "clicked",
G_CALLBACK(button_close_click_cb), panel);
--
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
[Xfce4-commits] [apps/gigolo] 17/35: Properly implement GtkApplication for unique application support
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit ad8107c2f6a5adc572350d5e5927390979dfd9f3
Author: Landry Breuil
Date: Sun Jun 19 16:24:55 2016 +0200
Properly implement GtkApplication for unique application support
-i still works to spawn a new instance
---
src/main.c | 45 -
1 file changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/main.c b/src/main.c
index 6d6150a..6bd1ef6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,6 +35,8 @@
#include "window.h"
+static int gigolo_create(GtkApplication *);
+
static gboolean show_version = FALSE;
static gboolean list_schemes = FALSE;
static gboolean new_instance = FALSE;
@@ -95,21 +97,25 @@ static void print_supported_schemes(void)
}
}
-static void activate (GApplication *app, gpointer user_data)
+static int activate (GtkApplication *app, gpointer user_data)
{
- GtkWidget *widget;
+ GList *list;
- widget = gtk_application_window_new (GTK_APPLICATION (app));
- gtk_widget_show (widget);
+ list = gtk_application_get_windows (app);
+ if (list)
+ {
+ gtk_window_present (GTK_WINDOW (list->data));
+ }
+ else
+ return gigolo_create(app);
+ return 0;
}
gint main(gint argc, gchar** argv)
{
- GigoloSettings *settings;
GtkApplication *gis = NULL;
- gchar *accel_filename;
+ gint status;
GOptionContext *context;
- GtkWidget *window;
bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
@@ -122,8 +128,6 @@ gint main(gint argc, gchar** argv)
g_option_context_parse(context, &argc, &argv, NULL);
g_option_context_free(context);
- gtk_init(&argc, &argv);
-
if (show_version)
{
g_print("%s %s\n\n", PACKAGE, VERSION);
@@ -148,16 +152,31 @@ gint main(gint argc, gchar** argv)
return ret ? EXIT_SUCCESS : EXIT_FAILURE;
}
+ verbose("Gigolo %s (GTK+ %u.%u.%u, GLib %u.%u.%u)",
+ VERSION,
+ gtk_major_version, gtk_minor_version, gtk_micro_version,
+ glib_major_version, glib_minor_version, glib_micro_version);
+
if (! new_instance)
{
gis = gtk_application_new("org.xfce.gigolo",
G_APPLICATION_FLAGS_NONE);
g_signal_connect (gis, "activate", G_CALLBACK (activate), NULL);
+ status = g_application_run (G_APPLICATION (gis), argc, argv);
+ }
+ else
+ {
+ gtk_init(&argc, &argv);
+ status = gigolo_create(NULL);
}
- verbose("Gigolo %s (GTK+ %u.%u.%u, GLib %u.%u.%u)",
- VERSION,
- gtk_major_version, gtk_minor_version, gtk_micro_version,
- glib_major_version, glib_minor_version, glib_micro_version);
+ return status;
+}
+
+static int gigolo_create(GtkApplication *gis)
+{
+ GigoloSettings *settings;
+ gchar *accel_filename;
+ GtkWidget *window;
settings = gigolo_settings_new();
--
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
[Xfce4-commits] [apps/gigolo] 21/35: Migrate from gtk_misc_set_alignment to gtk_label_set_xalign
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit e3659ab278de4a275f6fc85fbc81cf6d8dc0bc33
Author: Landry Breuil
Date: Sun Jun 19 16:57:28 2016 +0200
Migrate from gtk_misc_set_alignment to gtk_label_set_xalign
---
src/bookmarkeditdialog.c | 26 +-
src/mountdialog.c| 2 +-
src/preferencesdialog.c | 12 ++--
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 4b3d46f..7f6fd68 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -564,7 +564,7 @@ static void setup_for_type(GigoloBookmarkEditDialog *dialog)
if (meth->scheme == NULL)
{
- gtk_misc_set_alignment(GTK_MISC(priv->uri_label), 0.0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(priv->uri_label), 0);
gtk_widget_show(priv->uri_label);
gtk_table_attach(GTK_TABLE(table), priv->uri_label,
0, 1, i, i+1, GTK_FILL, GTK_FILL, 0, 0);
@@ -583,7 +583,7 @@ static void setup_for_type(GigoloBookmarkEditDialog *dialog)
else
gtk_label_set_text_with_mnemonic(GTK_LABEL(priv->host_label), _("_Server:"));
- gtk_misc_set_alignment(GTK_MISC(priv->host_label), 0.0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(priv->host_label), 0);
gtk_widget_show(priv->host_label);
gtk_table_attach(GTK_TABLE(table), priv->host_label,
0, 1, i, i+1, GTK_FILL, GTK_FILL, 0, 0);
@@ -597,7 +597,7 @@ static void setup_for_type(GigoloBookmarkEditDialog *dialog)
if (meth->flags & SHOW_SHARE)
{
- gtk_misc_set_alignment(GTK_MISC(priv->share_label),
0.0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(priv->share_label), 0);
gtk_widget_show(priv->share_label);
gtk_table_attach(GTK_TABLE(table), priv->share_label,
0, 1, i, i+1, GTK_FILL, GTK_FILL, 0,
0);
@@ -615,7 +615,7 @@ static void setup_for_type(GigoloBookmarkEditDialog *dialog)
}
if (meth->flags & SHOW_PATH)
{
- gtk_misc_set_alignment(GTK_MISC(priv->path_label), 0.0,
0.5);
+ gtk_label_set_xalign(GTK_LABEL(priv->path_label), 0);
gtk_widget_show(priv->path_label);
gtk_table_attach(GTK_TABLE(table), priv->path_label,
0, 1, i, i+1, GTK_FILL, GTK_FILL, 0,
0);
@@ -631,7 +631,7 @@ static void setup_for_type(GigoloBookmarkEditDialog *dialog)
if (meth->flags & (SHOW_PORT | SHOW_DOMAIN | SHOW_USER))
{
- gtk_misc_set_alignment(GTK_MISC(priv->information_label), 0.0,
0.5);
+ gtk_label_set_xalign(GTK_LABEL(priv->information_label), 0);
gtk_widget_show(priv->information_label);
gtk_table_attach(GTK_TABLE(table), priv->information_label,
0, 2, i, i+1, GTK_FILL, GTK_FILL, 0, 0);
@@ -640,7 +640,7 @@ static void setup_for_type(GigoloBookmarkEditDialog *dialog)
if (meth->flags & SHOW_PORT)
{
- gtk_misc_set_alignment(GTK_MISC(priv->port_label), 0.0,
0.5);
+ gtk_label_set_xalign(GTK_LABEL(priv->port_label), 0);
gtk_widget_show(priv->port_label);
gtk_table_attach(GTK_TABLE(table), priv->port_label,
0, 1, i, i+1, GTK_FILL, GTK_FILL, 0,
0);
@@ -655,7 +655,7 @@ static void setup_for_type(GigoloBookmarkEditDialog *dialog)
if (meth->flags & SHOW_FOLDER && priv->dialog_type !=
GIGOLO_BE_MODE_CONNECT)
{
- gtk_misc_set_alignment(GTK_MISC(priv->folder_label),
0.0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(priv->folder_label), 0);
gtk_widget_show(priv->folder_label);
gtk_table_attach(GTK_TABLE(table), priv->folder_label,
0, 1, i, i+1, GTK_FILL, GTK_FILL, 0,
0);
@@ -670,7 +670,7 @@ static void setup_for_type(GigoloBookmarkEditDialog *dialog)
if (meth->flags & SHOW_DOMAIN)
{
- gtk_misc_set_alignment(GTK_MISC(priv->domain_label),
0.0, 0.5);
+ gtk_label_set_xalign(GTK_LABEL(priv->domain_label), 0);
gtk_widget_show(priv->domain_label);
gtk_table_attach(GTK_TABLE(table), priv->domain_label,
0, 1, i, i+1, GTK_FILL, GTK_FILL, 0,
0);
@@ -685,7 +685,7 @@ static void setup_for_type(GigoloBookm
[Xfce4-commits] [apps/gigolo] 34/35: also expand the iconview
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit 82a53428ab3c8ccb16cfe189f5d36e6721a556cc Author: Landry Breuil Date: Tue Jul 5 21:45:44 2016 +0200 also expand the iconview --- src/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/window.c b/src/window.c index 1d4b12d..e9bd5da 100644 --- a/src/window.c +++ b/src/window.c @@ -1563,6 +1563,7 @@ static void gigolo_window_init(GigoloWindow *window) gtk_container_add(GTK_CONTAINER(priv->swin_treeview), priv->treeview); priv->swin_iconview = gtk_scrolled_window_new(NULL, NULL); + gtk_widget_set_hexpand(GTK_WIDGET(priv->swin_iconview), TRUE); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(priv->swin_iconview), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(priv->swin_iconview), GTK_SHADOW_IN); -- 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
[Xfce4-commits] [apps/gigolo] 15/35: forgotten include removal
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit c5e51471e7e9125f1fba00c868f915a112bef662 Author: Landry Breuil Date: Fri Jun 17 22:55:34 2016 +0200 forgotten include removal --- src/bookmarkdialog.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c index 950cc97..152d2b9 100644 --- a/src/bookmarkdialog.c +++ b/src/bookmarkdialog.c @@ -27,7 +27,6 @@ #include "settings.h" #include "backendgvfs.h" #include "window.h" -#include "compat.h" #include "common.h" #include "bookmarkdialog.h" #include "bookmarkeditdialog.h" -- 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
[Xfce4-commits] [apps/gigolo] 28/35: Migrate from GtkTable to GtkGrid
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 77a74472d291005788ef543a2d0705d9fb7769bf
Author: Landry Breuil
Date: Sun Jun 19 17:56:56 2016 +0200
Migrate from GtkTable to GtkGrid
Use set_hexpand to ensure column 1 expands in empty space
---
src/bookmarkeditdialog.c | 83 +++-
1 file changed, 33 insertions(+), 50 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 063bd5a..5d8956a 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -566,13 +566,11 @@ static void setup_for_type(GigoloBookmarkEditDialog
*dialog)
{
gtk_label_set_xalign(GTK_LABEL(priv->uri_label), 0);
gtk_widget_show(priv->uri_label);
- gtk_table_attach(GTK_TABLE(table), priv->uri_label,
- 0, 1, i, i+1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), priv->uri_label, 0, i, 1, 1);
gtk_label_set_mnemonic_widget(GTK_LABEL(priv->uri_label),
priv->uri_entry);
gtk_widget_show(priv->uri_entry);
- gtk_table_attach(GTK_TABLE(table), priv->uri_entry,
- 1, 2, i, i+1, GTK_FILL | GTK_EXPAND,
GTK_FILL, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), priv->uri_entry, 1, i, 1, 1);
i++;
}
@@ -585,13 +583,11 @@ static void setup_for_type(GigoloBookmarkEditDialog
*dialog)
gtk_label_set_xalign(GTK_LABEL(priv->host_label), 0);
gtk_widget_show(priv->host_label);
- gtk_table_attach(GTK_TABLE(table), priv->host_label,
- 0, 1, i, i+1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), priv->host_label, 0, i, 1, 1);
gtk_label_set_mnemonic_widget(GTK_LABEL(priv->host_label),
priv->host_entry);
gtk_widget_show(priv->host_entry);
- gtk_table_attach(GTK_TABLE(table), priv->host_entry,
- 1, 2, i, i+1, GTK_FILL | GTK_EXPAND,
GTK_FILL, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), priv->host_entry, 1, i, 1, 1);
i++;
@@ -599,17 +595,14 @@ static void setup_for_type(GigoloBookmarkEditDialog
*dialog)
{
gtk_label_set_xalign(GTK_LABEL(priv->share_label), 0);
gtk_widget_show(priv->share_label);
- gtk_table_attach(GTK_TABLE(table), priv->share_label,
- 0, 1, i, i+1, GTK_FILL, GTK_FILL, 0,
0);
+ gtk_grid_attach(GTK_GRID(table), priv->share_label, 0,
i, 1, 1);
gtk_label_set_mnemonic_widget(GTK_LABEL(priv->share_label), priv->share_combo);
gtk_widget_show(priv->share_combo);
- gtk_table_attach(GTK_TABLE(table), priv->share_combo,
- 1, 2, i, i+1, GTK_FILL | GTK_EXPAND,
GTK_FILL, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), priv->share_combo, 1,
i, 1, 1);
gtk_widget_show(priv->share_button);
- gtk_table_attach(GTK_TABLE(table), priv->share_button,
- 2, 3, i, i+1, GTK_FILL | GTK_EXPAND,
GTK_FILL, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), priv->share_button, 2,
i, 1, 1);
i++;
}
@@ -617,13 +610,11 @@ static void setup_for_type(GigoloBookmarkEditDialog
*dialog)
{
gtk_label_set_xalign(GTK_LABEL(priv->path_label), 0);
gtk_widget_show(priv->path_label);
- gtk_table_attach(GTK_TABLE(table), priv->path_label,
- 0, 1, i, i+1, GTK_FILL, GTK_FILL, 0,
0);
+ gtk_grid_attach(GTK_GRID(table), priv->path_label, 0,
i, 1, 1);
gtk_label_set_mnemonic_widget(GTK_LABEL(priv->path_label), priv->path_entry);
gtk_widget_show(priv->path_entry);
- gtk_table_attach(GTK_TABLE(table), priv->path_entry,
- 1, 2, i, i+1, GTK_FILL | GTK_EXPAND,
GTK_FILL, 0, 0);
+ gtk_grid_attach(GTK_GRID(table), priv->path_entry, 1,
i, 1, 1);
i++;
}
@@ -633,8 +624,7 @@ static void setup_for_type(GigoloBookmarkEditDialog *dialog)
{
gtk_label_set_xalign(GTK_LABEL(priv->information_label), 0);
gtk_widget_show(priv->information_label);
- gtk_table_attach(GTK_TABLE(table), priv->information_label,
- 0, 2, i, i+1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_att
[Xfce4-commits] [apps/gigolo] 18/35: unref the GtkApplication instance at the right spot to avoid a crash
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 119b8af6ae8ab8eb230724ea38ce0eb10742798d
Author: Landry Breuil
Date: Sun Jun 19 16:37:26 2016 +0200
unref the GtkApplication instance at the right spot to avoid a crash
---
src/main.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main.c b/src/main.c
index 6bd1ef6..12eabea 100644
--- a/src/main.c
+++ b/src/main.c
@@ -162,6 +162,7 @@ gint main(gint argc, gchar** argv)
gis = gtk_application_new("org.xfce.gigolo",
G_APPLICATION_FLAGS_NONE);
g_signal_connect (gis, "activate", G_CALLBACK (activate), NULL);
status = g_application_run (G_APPLICATION (gis), argc, argv);
+ g_object_unref(gis);
}
else
{
@@ -199,9 +200,6 @@ static int gigolo_create(GtkApplication *gis)
gtk_main();
g_object_unref(settings);
- if (gis != NULL)
- g_object_unref(gis);
-
gtk_accel_map_save(accel_filename);
g_free(accel_filename);
--
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
[Xfce4-commits] [apps/gigolo] 12/35: drop now useless inclusion of singleinstance.h header
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit 7ed65a89f047dad91ecaeb5db11bde57c82828db Author: Landry Breuil Date: Fri Jun 17 22:50:11 2016 +0200 drop now useless inclusion of singleinstance.h header --- src/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main.c b/src/main.c index 4b23c9b..6d6150a 100644 --- a/src/main.c +++ b/src/main.c @@ -33,7 +33,6 @@ #include "settings.h" #include "backendgvfs.h" #include "window.h" -#include "singleinstance.h" static gboolean show_version = FALSE; -- 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
[Xfce4-commits] [apps/gigolo] 19/35: Migrate from GdkColor to GdkRGBA, and from GtkColorButton to GtkColorChooser
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 01e12255e6e1212392ebf822fef4bbf2030f23df
Author: Landry Breuil
Date: Sun Jun 19 16:38:23 2016 +0200
Migrate from GdkColor to GdkRGBA, and from GtkColorButton to GtkColorChooser
---
src/bookmarkeditdialog.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 2638f7a..d7a4057 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -427,9 +427,9 @@ static void init_values(GigoloBookmarkEditDialog *dialog)
tmp = gigolo_bookmark_get_color(priv->bookmark_init);
if (tmp != NULL)
{
- GdkColor color;
- if (gdk_color_parse(tmp, &color))
-
gtk_color_button_set_color(GTK_COLOR_BUTTON(priv->color_chooser), &color);
+ GdkRGBA color;
+ if (gdk_rgba_parse(&color, tmp))
+
gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(priv->color_chooser), &color);
}
/* URI */
uri = gigolo_bookmark_get_uri(priv->bookmark_init);
@@ -772,7 +772,7 @@ static void fill_method_combo_box(GigoloBookmarkEditDialog
*dialog)
static void update_bookmark_color(GigoloBookmarkEditDialog *dialog)
{
GigoloBookmarkEditDialogPrivate *priv;
- GdkColor color;
+ GdkRGBA color;
gchar *color_string;
priv = GIGOLO_BOOKMARK_EDIT_DIALOG_GET_PRIVATE(dialog);
@@ -781,8 +781,8 @@ static void update_bookmark_color(GigoloBookmarkEditDialog
*dialog)
/* if no colour has been chosen by the user, don't set the
default colour (black) */
return;
- gtk_color_button_get_color(GTK_COLOR_BUTTON(priv->color_chooser),
&color);
- color_string = gdk_color_to_string(&color);
+ gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(priv->color_chooser),
&color);
+ color_string = gdk_rgba_to_string(&color);
gigolo_bookmark_set_color(priv->bookmark_update, color_string);
g_free(color_string);
}
--
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
[Xfce4-commits] [apps/gigolo] 07/35: Migrate to newer GTkComboBoxText API
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 93c0e138f0c6d5283d613fd6da8e45f5ff56c663
Author: Landry Breuil
Date: Fri Jun 17 22:46:22 2016 +0200
Migrate to newer GTkComboBoxText API
---
src/bookmarkeditdialog.c | 4 ++--
src/preferencesdialog.c | 22 +++---
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 4de244c..031b6d4 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -945,7 +945,7 @@ static void browse_host_finished_cb(G_GNUC_UNUSED
GigoloBackendGVFS *bnd, GSList
GSList *node;
for (node = shares; node != NULL; node = node->next)
{
-
gtk_combo_box_append_text(GTK_COMBO_BOX(priv->share_combo), node->data);
+
gtk_combo_box_text_append(GTK_COMBO_BOX(priv->share_combo), NULL, node->data);
}
gtk_combo_box_set_active(GTK_COMBO_BOX(priv->share_combo), 0);
@@ -1091,7 +1091,7 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
_("This is not used for the actual mount, only necessary for
opening the mount point in a file browser"));
priv->user_entry = gtk_entry_new();
priv->domain_entry = gtk_entry_new();
- priv->share_combo = gtk_combo_box_entry_new_text();
+ priv->share_combo = gtk_combo_box_new_with_entry();
priv->share_entry = gtk_bin_get_child(GTK_BIN(priv->share_combo));
priv->uri_label = gtk_label_new_with_mnemonic(_("_Location (URI):"));
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index 33d2122..46ff20c 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -142,11 +142,11 @@ static GtkWidget *add_toolbar_style_combo(GigoloSettings
*settings, const gchar
g_object_get(settings, property, &value, NULL);
- widget = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Icons"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Text"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Both"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Both horizontal"));
+ widget = gtk_combo_box_text_new();
+ gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Icons"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Text"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Both"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Both
horizontal"));
gtk_combo_box_set_active(GTK_COMBO_BOX(widget), value);
@@ -164,9 +164,9 @@ static GtkWidget
*add_toolbar_orientation_combo(GigoloSettings *settings, const
g_object_get(settings, property, &value, NULL);
- widget = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Horizontal"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Vertical"));
+ widget = gtk_combo_box_text_new();
+ gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Horizontal"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Vertical"));
gtk_combo_box_set_active(GTK_COMBO_BOX(widget), value);
@@ -184,9 +184,9 @@ static GtkWidget *add_view_mode_combo(GigoloSettings
*settings, const gchar *pro
g_object_get(settings, property, &value, NULL);
- widget = gtk_combo_box_new_text();
- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Symbols"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Detailed List"));
+ widget = gtk_combo_box_text_new();
+ gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Symbols"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Detailed
List"));
gtk_combo_box_set_active(GTK_COMBO_BOX(widget), value);
--
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
[Xfce4-commits] [apps/gigolo] 23/35: use the proper macro
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit d92da6c1a5483f012fdd8a0858044153899d8793
Author: Landry Breuil
Date: Sun Jun 19 16:58:41 2016 +0200
use the proper macro
---
src/preferencesdialog.c | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index 65dad12..12a418c 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -143,10 +143,10 @@ static GtkWidget *add_toolbar_style_combo(GigoloSettings
*settings, const gchar
g_object_get(settings, property, &value, NULL);
widget = gtk_combo_box_text_new();
- gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Icons"));
- gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Text"));
- gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Both"));
- gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Both
horizontal"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widget), NULL, _("Icons"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widget), NULL, _("Text"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widget), NULL, _("Both"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widget), NULL, _("Both
horizontal"));
gtk_combo_box_set_active(GTK_COMBO_BOX(widget), value);
@@ -165,8 +165,8 @@ static GtkWidget
*add_toolbar_orientation_combo(GigoloSettings *settings, const
g_object_get(settings, property, &value, NULL);
widget = gtk_combo_box_text_new();
- gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Horizontal"));
- gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Vertical"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widget), NULL,
_("Horizontal"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widget), NULL,
_("Vertical"));
gtk_combo_box_set_active(GTK_COMBO_BOX(widget), value);
@@ -185,8 +185,8 @@ static GtkWidget *add_view_mode_combo(GigoloSettings
*settings, const gchar *pro
g_object_get(settings, property, &value, NULL);
widget = gtk_combo_box_text_new();
- gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Symbols"));
- gtk_combo_box_text_append(GTK_COMBO_BOX(widget), NULL, _("Detailed
List"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widget), NULL,
_("Symbols"));
+ gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widget), NULL, _("Detailed
List"));
gtk_combo_box_set_active(GTK_COMBO_BOX(widget), value);
--
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
[Xfce4-commits] [apps/gigolo] 25/35: Inherit from GtkBox, and set orientation to vertical in _init
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit 5762bd26ea5cb611df78643951e6de1889a5f199 Author: Landry Breuil Date: Sun Jun 19 17:14:38 2016 +0200 Inherit from GtkBox, and set orientation to vertical in _init --- src/browsenetworkpanel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c index 8a8c7d8..4c2756a 100644 --- a/src/browsenetworkpanel.c +++ b/src/browsenetworkpanel.c @@ -67,7 +67,7 @@ static void tree_selection_changed_cb(GtkTreeSelection *selection, GigoloBrowseN static void browse_network_finished_cb(G_GNUC_UNUSED GigoloBackendGVFS *bnd, GigoloBrowseNetworkPanel *panel); -G_DEFINE_TYPE(GigoloBrowseNetworkPanel, gigolo_browse_network_panel, GTK_TYPE_VBOX); +G_DEFINE_TYPE(GigoloBrowseNetworkPanel, gigolo_browse_network_panel, GTK_TYPE_BOX); static void gigolo_browse_network_panel_finalize(GObject *object) @@ -98,7 +98,7 @@ static void gigolo_browse_network_panel_class_init(GigoloBrowseNetworkPanelClass g_object_class = G_OBJECT_CLASS(klass); g_object_class->finalize = gigolo_browse_network_panel_finalize; - gigolo_browse_network_panel_parent_class = (GtkVBoxClass*) g_type_class_peek(GTK_TYPE_VBOX); + gigolo_browse_network_panel_parent_class = (GtkBoxClass*) g_type_class_peek(GTK_TYPE_BOX); g_type_class_add_private(klass, sizeof(GigoloBrowseNetworkPanelPrivate)); } @@ -481,6 +481,7 @@ static void gigolo_browse_network_panel_init(GigoloBrowseNetworkPanel *panel) priv->browse_network_signal_id = 0; + gtk_orientable_set_orientation (GTK_ORIENTABLE (panel), GTK_ORIENTATION_VERTICAL); toolbar = gtk_toolbar_new(); gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ); gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar), GTK_ICON_SIZE_BUTTON); -- 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
[Xfce4-commits] [apps/gigolo] 05/35: Drop inclusion of now useless compat.h header
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit c53756b2486bab778a8b97444571ace38e9b5ac1 Author: Landry Breuil Date: Fri Jun 17 22:44:17 2016 +0200 Drop inclusion of now useless compat.h header --- src/bookmarkeditdialog.c | 1 - src/browsenetworkpanel.c | 1 - src/mountdialog.c| 1 - src/preferencesdialog.c | 1 - src/window.c | 1 - 5 files changed, 5 deletions(-) diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c index af4e637..d45a80e 100644 --- a/src/bookmarkeditdialog.c +++ b/src/bookmarkeditdialog.c @@ -27,7 +27,6 @@ #include #include "common.h" -#include "compat.h" #include "bookmark.h" #include "settings.h" #include "backendgvfs.h" diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c index 06d1826..c11d082 100644 --- a/src/browsenetworkpanel.c +++ b/src/browsenetworkpanel.c @@ -26,7 +26,6 @@ #include #include "common.h" -#include "compat.h" #include "backendgvfs.h" #include "bookmark.h" #include "settings.h" diff --git a/src/mountdialog.c b/src/mountdialog.c index 5ad14ac..c204ca7 100644 --- a/src/mountdialog.c +++ b/src/mountdialog.c @@ -24,7 +24,6 @@ #include #include "common.h" -#include "compat.h" #include "main.h" #include "mountdialog.h" diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c index 7580ed7..33d2122 100644 --- a/src/preferencesdialog.c +++ b/src/preferencesdialog.c @@ -25,7 +25,6 @@ #include #include "common.h" -#include "compat.h" #include "bookmark.h" #include "settings.h" #include "backendgvfs.h" diff --git a/src/window.c b/src/window.c index e170461..a7b4646 100644 --- a/src/window.c +++ b/src/window.c @@ -26,7 +26,6 @@ #include #include -#include "compat.h" #include "common.h" #include "bookmark.h" #include "settings.h" -- 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
[Xfce4-commits] [apps/gigolo] 33/35: replace gtk_image_set_from_stock by gtk_image_set_from_icon_name
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit dc8a3967788c248951e2a3f1d7d5ac40b0998cba Author: Landry Breuil Date: Mon Jun 20 21:15:39 2016 +0200 replace gtk_image_set_from_stock by gtk_image_set_from_icon_name --- src/preferencesdialog.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c index b0bafc5..68fbe81 100644 --- a/src/preferencesdialog.c +++ b/src/preferencesdialog.c @@ -221,11 +221,11 @@ static void entry_check_input(GtkEntry *entry) gtk_image_set_from_icon_name(icon, first_part, GTK_ICON_SIZE_MENU); } else - gtk_image_set_from_stock(icon, GTK_STOCK_EXECUTE, GTK_ICON_SIZE_MENU); + gtk_image_set_from_icon_name(icon, "gtk-execute", GTK_ICON_SIZE_MENU); g_free(path); } else - gtk_image_set_from_stock(icon, GTK_STOCK_STOP, GTK_ICON_SIZE_MENU); + gtk_image_set_from_icon_name(icon, "gtk-stop", GTK_ICON_SIZE_MENU); g_free(first_part); -- 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
[Xfce4-commits] [apps/gigolo] 10/35: GtkAboutDialog email/url hooks were removed from the API
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 414921b249e320235f245fdde19d0522b2e8ac9a
Author: Landry Breuil
Date: Fri Jun 17 22:48:32 2016 +0200
GtkAboutDialog email/url hooks were removed from the API
---
src/window.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/window.c b/src/window.c
index a7b4646..861f03d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -421,8 +421,6 @@ static void action_about_cb(G_GNUC_UNUSED GtkAction
*action, GigoloWindow *windo
{
const gchar *authors[]= { "Enrico Tröger ", NULL };
- gtk_about_dialog_set_email_hook(about_activate_link, NULL, NULL);
- gtk_about_dialog_set_url_hook(about_activate_link, NULL, NULL);
gtk_show_about_dialog(GTK_WINDOW(window),
"authors", authors,
"logo-icon-name", gigolo_get_application_icon_name(),
--
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
[Xfce4-commits] [apps/gigolo] 14/35: update .gitignore
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit b1d9191c4797132ee063b80778ed84de6f8a6730 Author: Landry Breuil Date: Fri Jun 17 22:54:08 2016 +0200 update .gitignore --- .gitignore | 25 + 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8d15613..8384052 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,25 @@ configure Makefile -_build_ -.lock-wscript -.waf-* +*.1 +*.desktop +INSTALL +Makefile.in* RUN +aclocal.m4 +autom4te.cache/ +compile +config.* +configure.ac +depcomp +install-sh +intltool*.in +missing +po/*.gmo +po/.intltool-merge-cache po/LINGUAS -INSTALL +po/POTFILES +po/stamp-it +src/*.o +src/.deps/ +src/gigolo +stamp-h1 -- 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
[Xfce4-commits] [apps/gigolo] branch master updated (3ea4493 -> 4de50e2)
This is an automated email from the git hooks/post-receive script. landry pushed a change to branch master in repository apps/gigolo. from 3ea4493 I18n: Update translation zh_CN (100%). new 4b7af71 Check for Gtk+-3.0 new 10e6a2e enable XDG_FEATURE_DEBUG new fe55392 Use gtk_mount_operation_new() instead of our own wrapper new 6bdd110 Stop using our own wrappers, use plain gtk functions new c53756b Drop inclusion of now useless compat.h header new a0b850a Migrate from GtkObject to GObject new 93c0e13 Migrate to newer GTkComboBoxText API new d0477b6 Use modern GDK_KEY defines new 0051c20 has-separator property was removed from the API new 414921b GtkAboutDialog email/url hooks were removed from the API new 6f421a3 Tentative migration from handrolled GigoloSingleInstance to GtkApplication new 7ed65a8 drop now useless inclusion of singleinstance.h header new e81fab6 Drop now useless old glue compat code for ancient Gtks new b1d9191 update .gitignore new c5e5147 forgotten include removal new 50bf2ae Migrate from GtkHBox/GtkVBox to GtkBox new ad8107c Properly implement GtkApplication for unique application support new 119b8af unref the GtkApplication instance at the right spot to avoid a crash new 01e1225 Migrate from GdkColor to GdkRGBA, and from GtkColorButton to GtkColorChooser new 4c837c8 use proper macro new e3659ab Migrate from gtk_misc_set_alignment to gtk_label_set_xalign new a0548e3 Migrate from GtkHSeparator to GtkSeparator new d92da6c use the proper macro new 2154397 remove now unused function new 5762bd2 Inherit from GtkBox, and set orientation to vertical in _init new b7b3939 Migrate to newer GdkCursor constructor new 2d01a55 More VBox/HPaned conversion new 77a7447 Migrate from GtkTable to GtkGrid new dd0e669 ensure the treeview expands in width new 4ad4e6e Oops, wrong box orientation for preferences dialog new e370301 Replace some GTK_STOCK macros by their string equivalence new a0f13a9 Replace gtk_tool_button_new_from_stock by gtk_tool_button_new new dc8a396 replace gtk_image_set_from_stock by gtk_image_set_from_icon_name new 82a5342 also expand the iconview new 4de50e2 Merge remote-tracking branch 'landry/master' The 35 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 25 +- configure.ac.in | 6 +- po/POTFILES.in | 3 - src/Makefile.am | 3 - src/backendgvfs.c| 11 +- src/bookmarkdialog.c | 11 +- src/bookmarkeditdialog.c | 157 ++-- src/bookmarkpanel.c | 13 +- src/browsenetworkpanel.c | 35 +-- src/compat.c | 95 --- src/compat.h | 37 --- src/main.c | 62 +++-- src/mountdialog.c| 18 +- src/mountoperation.c | 631 --- src/mountoperation.h | 51 src/preferencesdialog.c | 76 +++--- src/singleinstance.c | 282 - src/singleinstance.h | 52 src/window.c | 26 +- 19 files changed, 225 insertions(+), 1369 deletions(-) delete mode 100644 src/compat.c delete mode 100644 src/compat.h delete mode 100644 src/mountoperation.c delete mode 100644 src/mountoperation.h delete mode 100644 src/singleinstance.c delete mode 100644 src/singleinstance.h -- 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
[Xfce4-commits] [apps/gigolo] 09/35: has-separator property was removed from the API
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 0051c20f506e3fff91f95049aa0aa4b1232398ab
Author: Landry Breuil
Date: Fri Jun 17 22:47:38 2016 +0200
has-separator property was removed from the API
---
src/mountdialog.c | 1 -
src/preferencesdialog.c | 1 -
2 files changed, 2 deletions(-)
diff --git a/src/mountdialog.c b/src/mountdialog.c
index 250f428..fb59d14 100644
--- a/src/mountdialog.c
+++ b/src/mountdialog.c
@@ -95,7 +95,6 @@ static void gigolo_mount_dialog_init(GigoloMountDialog *self)
priv->timer_id = (guint) -1;
- gtk_dialog_set_has_separator(GTK_DIALOG(self), FALSE);
gtk_window_set_destroy_with_parent(GTK_WINDOW(self), TRUE);
gtk_window_set_default_size(GTK_WINDOW(self), 200, -1);
gtk_window_set_title(GTK_WINDOW(self), _("Connecting"));
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index 46ff20c..5c8dc89 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -504,7 +504,6 @@ static void
gigolo_preferences_dialog_init(GigoloPreferencesDialog *dialog)
g_object_set(dialog,
"icon-name", GTK_STOCK_PREFERENCES,
"title", _("Preferences"),
- "has-separator", FALSE,
NULL);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CLOSE,
GTK_RESPONSE_CLOSE, NULL);
}
--
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
[Xfce4-commits] [apps/gigolo] 31/35: Replace some GTK_STOCK macros by their string equivalence
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit e37030132b0cbda50580165e2c507bd9fdea883e
Author: Landry Breuil
Date: Mon Jun 20 21:14:25 2016 +0200
Replace some GTK_STOCK macros by their string equivalence
---
src/bookmarkdialog.c | 4 ++--
src/bookmarkeditdialog.c | 12 ++--
src/browsenetworkpanel.c | 7 ---
src/preferencesdialog.c | 4 ++--
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c
index 0b68770..7f7c22f 100644
--- a/src/bookmarkdialog.c
+++ b/src/bookmarkdialog.c
@@ -407,14 +407,14 @@ static void
gigolo_bookmark_dialog_init(GigoloBookmarkDialog *dialog)
GigoloBookmarkDialogPrivate *priv =
GIGOLO_BOOKMARK_DIALOG_GET_PRIVATE(dialog);
g_object_set(dialog,
- "icon-name", gigolo_find_icon_name("bookmark-new",
GTK_STOCK_EDIT),
+ "icon-name", gigolo_find_icon_name("bookmark-new", "gtk-edit"),
"title", _("Edit Bookmarks"),
NULL);
gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
gtk_box_set_spacing(GTK_BOX(vbox), 2);
- gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE,
GTK_RESPONSE_CLOSE);
+ gtk_dialog_add_button(GTK_DIALOG(dialog), "gtk-close",
GTK_RESPONSE_CLOSE);
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
gtk_window_set_default_size(GTK_WINDOW(dialog), 550, 350);
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 5d8956a..077c51a 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -875,22 +875,22 @@ static void
gigolo_bookmark_edit_dialog_set_property(GObject *object, guint prop
case GIGOLO_BE_MODE_CREATE:
{
title = _("Create Bookmark");
- button_stock_id = stock_id = GTK_STOCK_ADD;
+ button_stock_id = stock_id = "gtk-add";
combo_set_active(priv->type_combo, 0);
break;
}
case GIGOLO_BE_MODE_EDIT:
{
title = _("Edit Bookmark");
- stock_id = GTK_STOCK_EDIT;
- button_stock_id = GTK_STOCK_OK;
+ stock_id = "gtk-edit";
+ button_stock_id = "gtk-ok";
break;
}
case GIGOLO_BE_MODE_CONNECT:
default:
{
title = _("Connect to Server");
- button_stock_id = stock_id = GTK_STOCK_CONNECT;
+ button_stock_id = stock_id = "gtk-connect";
combo_set_active(priv->type_combo, 0);
gtk_widget_hide(priv->name_label);
gtk_widget_hide(priv->name_entry);
@@ -995,7 +995,7 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
2);
- gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, NULL);
+ gtk_dialog_add_buttons(GTK_DIALOG(dialog), "gtk-cancel",
GTK_RESPONSE_CANCEL, NULL);
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
@@ -1097,7 +1097,7 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
priv->share_button = gtk_button_new();
gtk_button_set_image(GTK_BUTTON(priv->share_button),
- gtk_image_new_from_stock(GTK_STOCK_REFRESH,
GTK_ICON_SIZE_MENU));
+ gtk_image_new_from_icon_name("gtk-refresh",
GTK_ICON_SIZE_MENU));
gtk_widget_set_sensitive(priv->share_button, FALSE);
g_signal_connect(priv->share_button, "clicked",
G_CALLBACK(share_button_clicked_cb), dialog);
diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c
index ed3e763..1ee51ac 100644
--- a/src/browsenetworkpanel.c
+++ b/src/browsenetworkpanel.c
@@ -452,7 +452,7 @@ static void tree_prepare(GigoloBrowseNetworkPanel *panel)
priv->item_bookmark = item =
gtk_image_menu_item_new_with_mnemonic(_("Create _Bookmark"));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
gtk_image_new_from_icon_name(
- gigolo_find_icon_name("bookmark-new", GTK_STOCK_EDIT),
GTK_ICON_SIZE_BUTTON));
+ gigolo_find_icon_
[Xfce4-commits] [apps/gigolo] 13/35: Drop now useless old glue compat code for ancient Gtks
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit e81fab603554a106bc823b1c44de1d549ec6fa26
Author: Landry Breuil
Date: Fri Jun 17 22:50:51 2016 +0200
Drop now useless old glue compat code for ancient Gtks
---
po/POTFILES.in | 3 -
src/Makefile.am | 3 -
src/compat.c | 95
src/compat.h | 37 ---
src/mountoperation.c | 631 ---
src/mountoperation.h | 51 -
src/singleinstance.c | 282 ---
src/singleinstance.h | 52 -
8 files changed, 1154 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4f63303..06667fb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,13 +1,11 @@
# List of source files containing translatable strings.
src/main.c
-src/compat.c
src/common.c
src/window.c
src/bookmark.c
src/settings.c
src/menubuttonaction.c
-src/mountoperation.c
src/bookmarkdialog.c
src/bookmarkeditdialog.c
src/preferencesdialog.c
@@ -15,5 +13,4 @@ src/backendgvfs.c
src/mountdialog.c
src/browsenetworkpanel.c
src/bookmarkpanel.c
-src/singleinstance.c
gigolo.desktop.in
diff --git a/src/Makefile.am b/src/Makefile.am
index a3588d7..d96b04b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,6 @@ bin_PROGRAMS = gigolo
gigolo_SOURCES =
\
main.c main.h
\
- compat.c compat.h
\
common.c common.h
\
window.c window.h
\
bookmark.c bookmark.h \
@@ -11,12 +10,10 @@ gigolo_SOURCES =
\
backendgvfs.c backendgvfs.h \
menubuttonaction.c menubuttonaction.h \
mountdialog.c mountdialog.h \
- mountoperation.c mountoperation.h \
bookmarkpanel.c bookmarkpanel.h \
bookmarkdialog.c bookmarkdialog.h \
bookmarkeditdialog.c bookmarkeditdialog.h \
browsenetworkpanel.c browsenetworkpanel.h \
- singleinstance.c singleinstance.h \
preferencesdialog.c preferencesdialog.h
diff --git a/src/compat.c b/src/compat.c
deleted file mode 100644
index d6b3ad1..000
--- a/src/compat.c
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * compat.c
- *
- * Copyright 2008-2011 Enrico Tröger
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- */
-
-
-#include "config.h"
-
-#include
-
-#include "compat.h"
-
-
-GdkWindow *gigolo_widget_get_window(GtkWidget *widget)
-{
-#if GTK_CHECK_VERSION(2, 14, 0)
- return gtk_widget_get_window(widget);
-#else
- return widget->window;
-#endif
-}
-
-
-GtkWidget *gigolo_dialog_get_content_area(GtkDialog *dialog)
-{
-#if GTK_CHECK_VERSION(2, 14, 0)
- return gtk_dialog_get_content_area(dialog);
-#else
- return dialog->vbox;
-#endif
-}
-
-
-GtkWidget *gigolo_dialog_get_action_area(GtkDialog *dialog)
-{
-#if GTK_CHECK_VERSION(2, 14, 0)
- return gtk_dialog_get_action_area(dialog);
-#else
- return dialog->action_area;
-#endif
-}
-
-
-guint32 gigolo_widget_get_flags(GtkWidget *widget)
-{
-#ifdef GSEAL_ENABLE
- /* This is an ugly hack to get GTK_WIDGET_FLAGS() flags working with
GSEAL enabled,
-* we simply create a fake object which looks like a GtkObject and then
access its flags field */
- typedef struct
- {
- GInitiallyUnowned parent_instance;
- guint32 flags;
- } FakeGtkObject;
- FakeGtkObject *fgo = (FakeGtkObject*) widget;
-
- return fgo->flags;
-#else
- return GTK_OBJECT(widget)->flags;
-#endif
-}
-
-
-void gigolo_status_icon_set_tooltip_text(GtkStatusIcon *status_icon, const
gchar *tooltip_text)
-{
-#if GTK_CHECK_VERSION(2, 16, 0)
- gtk_status_icon_set_tooltip_text(status_icon, tooltip_text);
-#else
-
[Xfce4-commits] [apps/gigolo] 04/35: Stop using our own wrappers, use plain gtk functions
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit 6bdd110b353806ececbfba9a843476e8e5ed5528
Author: Landry Breuil
Date: Fri Jun 17 22:42:26 2016 +0200
Stop using our own wrappers, use plain gtk functions
---
src/bookmarkdialog.c | 2 +-
src/bookmarkeditdialog.c | 6 +++---
src/browsenetworkpanel.c | 4 ++--
src/mountdialog.c| 2 +-
src/preferencesdialog.c | 2 +-
src/window.c | 6 +++---
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/bookmarkdialog.c b/src/bookmarkdialog.c
index c283cc5..950cc97 100644
--- a/src/bookmarkdialog.c
+++ b/src/bookmarkdialog.c
@@ -412,7 +412,7 @@ static void
gigolo_bookmark_dialog_init(GigoloBookmarkDialog *dialog)
"title", _("Edit Bookmarks"),
NULL);
gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
- vbox = gigolo_dialog_get_content_area(GTK_DIALOG(dialog));
+ vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
gtk_box_set_spacing(GTK_BOX(vbox), 2);
gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CLOSE,
GTK_RESPONSE_CLOSE);
diff --git a/src/bookmarkeditdialog.c b/src/bookmarkeditdialog.c
index 16b1cf4..af4e637 100644
--- a/src/bookmarkeditdialog.c
+++ b/src/bookmarkeditdialog.c
@@ -224,7 +224,7 @@ gint
gigolo_bookmark_edit_dialog_run(GigoloBookmarkEditDialog *dialog)
/* perform some error checking and don't return until entered
values are sane */
else
{
- if (gigolo_widget_get_flags(priv->name_entry) &
GTK_VISIBLE)
+ if (gtk_widget_is_visible(priv->name_entry))
{ /* check the name only if we are
creating/editing a bookmark */
tmp =
gtk_entry_get_text(GTK_ENTRY(priv->name_entry));
if (! *tmp)
@@ -1013,7 +1013,7 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
priv->dialog_type = GIGOLO_BE_MODE_EDIT;
gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
-
gtk_box_set_spacing(GTK_BOX(gigolo_dialog_get_content_area(GTK_DIALOG(dialog))),
2);
+
gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
2);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_CANCEL,
GTK_RESPONSE_CANCEL, NULL);
gtk_window_set_destroy_with_parent(GTK_WINDOW(dialog), TRUE);
@@ -1022,7 +1022,7 @@ static void
gigolo_bookmark_edit_dialog_init(GigoloBookmarkEditDialog *dialog)
vbox = gtk_vbox_new(FALSE, 6);
gtk_container_set_border_width(GTK_CONTAINER (vbox), 5);
-
gtk_box_pack_start(GTK_BOX(gigolo_dialog_get_content_area(GTK_DIALOG(dialog))),
+
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),
vbox, FALSE, TRUE, 0);
hbox = gtk_hbox_new(FALSE, 6);
diff --git a/src/browsenetworkpanel.c b/src/browsenetworkpanel.c
index d0cdc09..06d1826 100644
--- a/src/browsenetworkpanel.c
+++ b/src/browsenetworkpanel.c
@@ -215,7 +215,7 @@ static void browse_network_finished_cb(G_GNUC_UNUSED
GigoloBackendGVFS *bnd, Gig
gtk_widget_set_sensitive(priv->button_refresh, TRUE);
- gdk_window_set_cursor(gigolo_widget_get_window(GTK_WIDGET(panel)),
NULL);
+ gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(panel)), NULL);
}
@@ -235,7 +235,7 @@ static gboolean delay_refresh(GigoloBrowseNetworkPanel
*panel)
{
GigoloBrowseNetworkPanelPrivate *priv =
GIGOLO_BROWSE_NETWORK_PANEL_GET_PRIVATE(panel);
- gdk_window_set_cursor(gigolo_widget_get_window(GTK_WIDGET(panel)),
priv->wait_cursor);
+ gdk_window_set_cursor(gtk_widget_get_window(GTK_WIDGET(panel)),
priv->wait_cursor);
/* Force the update of the cursor */
while (g_main_context_iteration(NULL, FALSE));
diff --git a/src/mountdialog.c b/src/mountdialog.c
index f365e6b..5ad14ac 100644
--- a/src/mountdialog.c
+++ b/src/mountdialog.c
@@ -103,7 +103,7 @@ static void gigolo_mount_dialog_init(GigoloMountDialog
*self)
vbox = gtk_vbox_new(FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
-
gtk_container_add(GTK_CONTAINER(gigolo_dialog_get_content_area(GTK_DIALOG(self))),
vbox);
+
gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(self))),
vbox);
priv->label = gtk_label_new(NULL);
gtk_misc_set_alignment(GTK_MISC(priv->label), 0.1, 0.5);
diff --git a/src/preferencesdialog.c b/src/preferencesdialog.c
index c9747d9..7580ed7 100644
--- a/src/preferencesdialog.c
+++ b/src/preferencesdialog.c
@@ -310,7 +310,7 @@ static void set_settings(GigoloPreferencesDialog *dialog,
GigoloSettings *settin
GtkWidget *label1, *label2, *label3, *label4, *image;
GtkSizeGroup *sg;
-vbox = gigolo_dialog_get_content_area(GT
[Xfce4-commits] [apps/gigolo] 02/35: enable XDG_FEATURE_DEBUG
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit 10e6a2eab37384c17cb97e18dec58cf66d1891fa Author: Landry Breuil Date: Fri Jun 17 22:35:39 2016 +0200 enable XDG_FEATURE_DEBUG --- configure.ac.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac.in b/configure.ac.in index b217f52..97f0501 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -34,6 +34,8 @@ GTK_VERSION=`$PKG_CONFIG --modversion gtk+-3.0` # i18n XDT_I18N([@LINGUAS@]) +XDT_FEATURE_DEBUG() + AM_GLIB_GNU_GETTEXT IT_PROG_INTLTOOL # workaround for intltool bug (http://bugzilla.gnome.org/show_bug.cgi?id=490845) -- 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
[Xfce4-commits] [apps/gigolo] 03/35: Use gtk_mount_operation_new() instead of our own wrapper
This is an automated email from the git hooks/post-receive script.
landry pushed a commit to branch master
in repository apps/gigolo.
commit fe55392049e4cc3b21cd43493ecdc84fae70ddf4
Author: Landry Breuil
Date: Fri Jun 17 22:37:33 2016 +0200
Use gtk_mount_operation_new() instead of our own wrapper
---
src/backendgvfs.c | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/backendgvfs.c b/src/backendgvfs.c
index f52dce9..f2cc598 100644
--- a/src/backendgvfs.c
+++ b/src/backendgvfs.c
@@ -28,7 +28,6 @@
#include "bookmark.h"
#include "settings.h"
#include "window.h"
-#include "mountoperation.h"
typedef struct _GigoloBackendGVFSPrivate
GigoloBackendGVFSPrivate;
@@ -513,7 +512,7 @@ gboolean gigolo_backend_gvfs_mount_volume(GigoloBackendGVFS
*backend, GtkWindow
if (! G_IS_MOUNT(vol) && G_IS_VOLUME(vol) &&
g_volume_can_mount(G_VOLUME(vol)))
{
- GMountOperation *op = gigolo_mount_operation_new(window);
+ GMountOperation *op = gtk_mount_operation_new(window);
g_volume_mount(G_VOLUME(vol), G_MOUNT_MOUNT_NONE, op, NULL,
volume_mount_finished_cb, backend);
@@ -535,7 +534,7 @@ void gigolo_backend_gvfs_unmount_mount(GigoloBackendGVFS
*backend, gpointer moun
g_return_if_fail(mount != NULL);
#if GLIB_CHECK_VERSION(2, 22, 0)
- op = gigolo_mount_operation_new(parent);
+ op = gtk_mount_operation_new(parent);
g_mount_unmount_with_operation(
G_MOUNT(mount), G_MOUNT_UNMOUNT_NONE, op, NULL,
unmount_finished_cb, backend);
g_object_unref(op);
@@ -593,7 +592,7 @@ void gigolo_backend_gvfs_mount_uri(GigoloBackendGVFS
*backend, const gchar *uri,
g_return_if_fail(uri != NULL);
g_return_if_fail(backend != NULL);
- op = gigolo_mount_operation_new(GTK_WINDOW(parent));
+ op = gtk_mount_operation_new(GTK_WINDOW(parent));
file = g_file_new_for_uri(uri);
mi = g_new0(MountInfo, 1);
mi->self = backend;
@@ -714,7 +713,7 @@ static void browse_network_real(BrowseData *bd)
{
if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED))
{
- GMountOperation *op =
gigolo_mount_operation_new(bd->parent);
+ GMountOperation *op =
gtk_mount_operation_new(bd->parent);
/* if the URI wasn't mounted yet, mount it and try
again from the mount ready callback */
g_file_mount_enclosing_volume(file, G_MOUNT_MOUNT_NONE,
op, NULL,
(GAsyncReadyCallback)
browse_network_mount_ready_cb, bd);
@@ -850,7 +849,7 @@ static void browse_host_real(BrowseData *bd)
{
if (g_error_matches(error, G_IO_ERROR, G_IO_ERROR_NOT_MOUNTED))
{
- GMountOperation *op =
gigolo_mount_operation_new(bd->parent);
+ GMountOperation *op =
gtk_mount_operation_new(bd->parent);
/* if the URI wasn't mounted yet, mount it and try
again from the mount ready callback */
g_file_mount_enclosing_volume(file, G_MOUNT_MOUNT_NONE,
op, NULL,
(GAsyncReadyCallback)
browse_network_mount_ready_cb, bd);
--
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
[Xfce4-commits] [apps/gigolo] 01/35: Check for Gtk+-3.0
This is an automated email from the git hooks/post-receive script. landry pushed a commit to branch master in repository apps/gigolo. commit 4b7af71b712e63e2a8f43eacf9686a9801c32d77 Author: Landry Breuil Date: Fri Jun 17 22:35:12 2016 +0200 Check for Gtk+-3.0 --- configure.ac.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 16fd5f7..b217f52 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -19,7 +19,7 @@ AC_PROG_LN_S # GTK checks -gtk_modules="gtk+-2.0 >= 2.12.0 gio-2.0 >= 2.16.0 x11" +gtk_modules="gtk+-3.0 >= 3.14 gio-2.0 >= 2.16.0 x11" PKG_CHECK_MODULES(GTK, [$gtk_modules]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) @@ -29,7 +29,7 @@ AC_SUBST(GTK_LIBS) AC_ARG_ENABLE(deprecated, [ --disable-deprecatedDisable deprecated GTK functions. ], [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], []) -GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0` +GTK_VERSION=`$PKG_CONFIG --modversion gtk+-3.0` # i18n XDT_I18N([@LINGUAS@]) -- 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
[Xfce4-commits] [apps/xfce4-terminal] branch master updated (7359253 -> 3cc680d)
This is an automated email from the git hooks/post-receive script. f2404 pushed a change to branch master in repository apps/xfce4-terminal. from 7359253 Release 0.8.1 new 3cc680d Return to git versioning The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: configure.ac.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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
[Xfce4-commits] [apps/xfce4-terminal] 01/01: Return to git versioning
This is an automated email from the git hooks/post-receive script. f2404 pushed a commit to branch master in repository apps/xfce4-terminal. commit 3cc680de6f0182eba583357297f71851ceb6feeb Author: Igor Date: Mon Oct 31 17:56:05 2016 +0300 Return to git versioning --- configure.ac.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 2fb9815..8aacbf6 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -13,7 +13,7 @@ m4_define([terminal_version_minor], [8]) m4_define([terminal_version_micro], [1]) m4_define([terminal_version_nano], []) m4_define([terminal_version_build], [@REVISION@]) -m4_define([terminal_version_tag], []) +m4_define([terminal_version_tag], [git]) m4_define([terminal_version_dbus], [5]) m4_define([terminal_version], [terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(), [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [git], [terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])]) -- 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
[Xfce4-commits] [apps/xfce4-terminal] branch master updated (e18a952 -> 7359253)
This is an automated email from the git hooks/post-receive script. f2404 pushed a change to branch master in repository apps/xfce4-terminal. from e18a952 I18n: Update translation fr (100%). new 7359253 Release 0.8.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: NEWS| 20 configure.ac.in | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) -- 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
[Xfce4-commits] [apps/xfce4-terminal] 01/01: Release 0.8.1
This is an automated email from the git hooks/post-receive script. f2404 pushed a commit to branch master in repository apps/xfce4-terminal. commit 735925350afbd528947767ad1a7ec4d46ee29c6e Author: Igor Date: Mon Oct 31 17:48:22 2016 +0300 Release 0.8.1 --- NEWS| 20 configure.ac.in | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 331b857..018d515 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,23 @@ +0.8.1 += +- Fix Ctrl press recognition for opening URIs with Ctrl+click +- Set preferences dialog type hint to make it show on top +- Fix toggling fullscreen mode with F11 for a drop-down window (bugs + #12913, #12930) +- Allow setting of empty shortcut for goto-tab actions (Alt+digit) +- Resolve window manager warning: Buggy client sent a _NET_ACTIVE_WINDOW + message with a timestamp of 0 +- Fix drop-down window visibility check (bug #12917) +- Resolve some deprecation warnings +- Fix drop-down window not shown on different workspaces +- Add MiscUseShiftArrowsToScroll hidden option to allow Shift+arrows + one-line scroll (off by default) +- Allow user-defined color palettes - should be located under + ~/.config/xfce4/terminal/colorschemes/ (bug #12908) +- Set window hints properly; show columns/rows when resizing (bug #12793) +- Translation updates: Chinese (China), Croatian, English (Australia), French, + Kazakh, Lithuanian, Malay, Polish, Spanish, Ukrainian + 0.8.0 = - Move context menu zoom actions to a sub-menu diff --git a/configure.ac.in b/configure.ac.in index 4c8e99d..2fb9815 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -10,10 +10,10 @@ dnl *** Version information *** dnl *** m4_define([terminal_version_major], [0]) m4_define([terminal_version_minor], [8]) -m4_define([terminal_version_micro], [0]) +m4_define([terminal_version_micro], [1]) m4_define([terminal_version_nano], []) m4_define([terminal_version_build], [@REVISION@]) -m4_define([terminal_version_tag], [git]) +m4_define([terminal_version_tag], []) m4_define([terminal_version_dbus], [5]) m4_define([terminal_version], [terminal_version_major().terminal_version_minor().terminal_version_micro()ifelse(terminal_version_nano(), [], [], [.terminal_version_nano()])ifelse(terminal_version_tag(), [git], [terminal_version_tag()-terminal_version_build()], [terminal_version_tag()])]) -- 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
[Xfce4-commits] [apps/xfce4-terminal] annotated tag xfce4-terminal-0.8.1 created (now fb32d89)
This is an automated email from the git hooks/post-receive script. f2404 pushed a change to annotated tag xfce4-terminal-0.8.1 in repository apps/xfce4-terminal. at fb32d89 (tag) tagging 735925350afbd528947767ad1a7ec4d46ee29c6e (commit) replaces xfce4-terminal-0.8.0 tagged by Igor on Mon Oct 31 17:48:37 2016 +0300 - Log - 0.8.1 = - Fix Ctrl press recognition for opening URIs with Ctrl+click - Set preferences dialog type hint to make it show on top - Fix toggling fullscreen mode with F11 for a drop-down window (bugs #12913, #12930) - Allow setting of empty shortcut for goto-tab actions (Alt+digit) - Resolve window manager warning: Buggy client sent a _NET_ACTIVE_WINDOW message with a timestamp of 0 - Fix drop-down window visibility check (bug #12917) - Resolve some deprecation warnings - Fix drop-down window not shown on different workspaces - Add MiscUseShiftArrowsToScroll hidden option to allow Shift+arrows one-line scroll (off by default) - Allow user-defined color palettes - should be located under ~/.config/xfce4/terminal/colorschemes/ (bug #12908) - Set window hints properly; show columns/rows when resizing (bug #12793) - Translation updates: Chinese (China), Croatian, English (Australia), French, Kazakh, Lithuanian, Malay, Polish, Spanish, Ukrainian --- No new revisions were added by this update. -- 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
[Xfce4-commits] [apps/xfce4-terminal] branch master updated (fdc57ae -> e18a952)
This is an automated email from the git hooks/post-receive script. transifex pushed a change to branch master in repository apps/xfce4-terminal. from fdc57ae Restore deprecated gdk_keyboard_(un)grab new e18a952 I18n: Update translation fr (100%). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: po/fr.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- 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
[Xfce4-commits] [apps/xfce4-terminal] 01/01: I18n: Update translation fr (100%).
This is an automated email from the git hooks/post-receive script. transifex pushed a commit to branch master in repository apps/xfce4-terminal. commit e18a952acae50ad5210ae03f85840cbe624634cc Author: Yannick Le Guen Date: Mon Oct 31 12:30:58 2016 +0100 I18n: Update translation fr (100%). 321 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). --- po/fr.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 3c86578..4ef28e6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: Xfce Apps\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-10-14 18:30+0200\n" -"PO-Revision-Date: 2016-10-15 10:01+\n" +"PO-Revision-Date: 2016-10-31 08:39+\n" "Last-Translator: Yannick Le Guen \n" "Language-Team: French (http://www.transifex.com/xfce/xfce-apps/language/fr/)\n" "MIME-Version: 1.0\n" @@ -519,7 +519,7 @@ msgstr "Ouvrir un _onglet" #: ../terminal/terminal-window.c:232 msgid "Open a new terminal tab" -msgstr "Ouvre un terminal dans un nouvel onglet" +msgstr "Ouvrir un terminal dans un nouvel onglet" #: ../terminal/terminal-window.c:233 msgid "Open T_erminal" @@ -583,7 +583,7 @@ msgstr "Pr_éférences..." #: ../terminal/terminal-window.c:244 msgid "Open the preferences dialog" -msgstr "Ouvre la fenêtre des préférences" +msgstr "Ouvrir la fenêtre des préférences" #: ../terminal/terminal-window.c:245 msgid "_View" @@ -1172,7 +1172,7 @@ msgstr "Sélecteur de couleur" #: ../terminal/terminal-preferences.glade.h:91 msgid "Open a dialog to specify the color" -msgstr "Ouvre une fenêtre pour spécifier la couleur" +msgstr "Ouvrir une fenêtre pour spécifier la couleur" #: ../terminal/terminal-preferences.glade.h:92 msgid "Cu_rsor color:" -- 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
