[Xfce4-commits] tumbler:master Always add file to the supported URI schemes. Fix compiler warnings.
Updating branch refs/heads/master
to 7d6875461d59e7b7c558f5586ceb4df92b3c57a9 (commit)
from 5162982c8acaaf3b7677e0627e9fc4a757ac9213 (commit)
commit 7d6875461d59e7b7c558f5586ceb4df92b3c57a9
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 30 14:48:25 2009 +0200
Always add file to the supported URI schemes. Fix compiler warnings.
There's a bug in GIO/GVfs which doesn't include file in the URI
schemes returned by g_vfs_get_supported_uri_schemes(). Bug filed
upstream on http://bugzilla.gnome.org/show_bug.cgi?id=596867.
.../font-thumbnailer/font-thumbnailer-provider.c | 20 +-
plugins/font-thumbnailer/font-thumbnailer.c|4 +-
.../pixbuf-thumbnailer-provider.c | 21 ---
3 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/plugins/font-thumbnailer/font-thumbnailer-provider.c
b/plugins/font-thumbnailer/font-thumbnailer-provider.c
index 487646f..4e5b669 100644
--- a/plugins/font-thumbnailer/font-thumbnailer-provider.c
+++ b/plugins/font-thumbnailer/font-thumbnailer-provider.c
@@ -111,14 +111,27 @@ font_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provider
application/x-font-type1,
NULL,
};
- const gchar *const *uri_schemes;
+ const gchar *const *supported_schemes;
FontThumbnailer*thumbnailer;
GList *thumbnailers = NULL;
+ GStrv uri_schemes;
+ guint length;
+ guint n;
GVfs *vfs;
/* determine the URI schemes supported by GIO */
vfs = g_vfs_get_default ();
- uri_schemes = g_vfs_get_supported_uri_schemes (vfs);
+ supported_schemes = g_vfs_get_supported_uri_schemes (vfs);
+
+ /* copy the supported schemes array and add the file scheme, which for
+ * some odd reason is not included by default. Bug filed on
+ * http://bugzilla.gnome.org/show_bug.cgi?id=596867 */
+ length = g_strv_length ((gchar **)supported_schemes);
+ uri_schemes = g_new0 (gchar *, length + 1);
+ uri_schemes[0] = (gchar *)file;
+ for (n = 0; n length; ++n)
+uri_schemes[1+n] = (gchar *)supported_schemes[n];
+ uri_schemes[n] = NULL;
/* create the pixbuf thumbnailer */
thumbnailer = g_object_new (TYPE_FONT_THUMBNAILER,
@@ -128,5 +141,8 @@ font_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provider
/* add the thumbnailer to the list */
thumbnailers = g_list_append (thumbnailers, thumbnailer);
+ /* free URI schemes array (not its contents) */
+ g_free (uri_schemes);
+
return thumbnailers;
}
diff --git a/plugins/font-thumbnailer/font-thumbnailer.c
b/plugins/font-thumbnailer/font-thumbnailer.c
index d7b089b..958568e 100644
--- a/plugins/font-thumbnailer/font-thumbnailer.c
+++ b/plugins/font-thumbnailer/font-thumbnailer.c
@@ -501,8 +501,8 @@ font_thumbnailer_create (TumblerAbstractThumbnailer
*thumbnailer,
g_object_unref (file);
/* try to open the font file */
- ft_error = FT_New_Memory_Face (font_thumbnailer-library, font_data, length,
- 0, face);
+ ft_error = FT_New_Memory_Face (font_thumbnailer-library, (const FT_Byte
*)font_data,
+ length, 0, face);
if (G_UNLIKELY (ft_error != 0))
{
/* the font file could not be loaded, emit an error signal */
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
index d0deebd..320503a 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
@@ -104,7 +104,7 @@ static GList *
pixbuf_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider
*provider)
{
PixbufThumbnailer *thumbnailer;
- const gchar *const *uri_schemes;
+ const gchar *const *supported_schemes;
GHashTable *types;
GSList *formats;
GSList *fp;
@@ -113,12 +113,24 @@ pixbuf_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provid
GList *thumbnailers = NULL;
GStrv format_types;
GStrv mime_types;
+ GStrv uri_schemes;
GVfs *vfs;
- gintn;
+ guint length;
+ guint n;
/* determine which URI schemes are supported by GIO */
vfs = g_vfs_get_default ();
- uri_schemes = g_vfs_get_supported_uri_schemes (vfs);
+ supported_schemes = g_vfs_get_supported_uri_schemes (vfs);
+
+ /* copy the supported schemes array and add the file scheme, which for
+ * some odd reason is not included by default. Bug filed on
+ * http://bugzilla.gnome.org/show_bug.cgi?id=596867 */
+ length = g_strv_length ((gchar **)supported_schemes);
+ uri_schemes = g_new0 (gchar *, length + 1);
+ uri_schemes[0] = (gchar *)file;
+ for (n = 0; n length; ++n)
+uri_schemes[1+n] = (gchar *)supported_schemes[n];
+ uri_schemes[n] = NULL;
[Xfce4-commits] tumbler:master Always check for file and add it if necessary. Clearly the better way.
Updating branch refs/heads/master
to fd8d82d61bf59129583dc2dab7edae54be214f31 (commit)
from 7d6875461d59e7b7c558f5586ceb4df92b3c57a9 (commit)
commit fd8d82d61bf59129583dc2dab7edae54be214f31
Author: Jannis Pohlmann jan...@xfce.org
Date: Wed Sep 30 15:09:16 2009 +0200
Always check for file and add it if necessary. Clearly the better way.
.../font-thumbnailer/font-thumbnailer-provider.c | 21 +-
.../pixbuf-thumbnailer-provider.c | 42
tumbler/Makefile.am|4 +-
tumbler/tumbler-util.c | 69
.../{tumbler-glib-extensions.h = tumbler-util.h} | 20 ++
tumbler/tumbler.h |1 +
6 files changed, 95 insertions(+), 62 deletions(-)
diff --git a/plugins/font-thumbnailer/font-thumbnailer-provider.c
b/plugins/font-thumbnailer/font-thumbnailer-provider.c
index 4e5b669..65158a5 100644
--- a/plugins/font-thumbnailer/font-thumbnailer-provider.c
+++ b/plugins/font-thumbnailer/font-thumbnailer-provider.c
@@ -111,27 +111,12 @@ font_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provider
application/x-font-type1,
NULL,
};
- const gchar *const *supported_schemes;
FontThumbnailer*thumbnailer;
GList *thumbnailers = NULL;
GStrv uri_schemes;
- guint length;
- guint n;
- GVfs *vfs;
/* determine the URI schemes supported by GIO */
- vfs = g_vfs_get_default ();
- supported_schemes = g_vfs_get_supported_uri_schemes (vfs);
-
- /* copy the supported schemes array and add the file scheme, which for
- * some odd reason is not included by default. Bug filed on
- * http://bugzilla.gnome.org/show_bug.cgi?id=596867 */
- length = g_strv_length ((gchar **)supported_schemes);
- uri_schemes = g_new0 (gchar *, length + 1);
- uri_schemes[0] = (gchar *)file;
- for (n = 0; n length; ++n)
-uri_schemes[1+n] = (gchar *)supported_schemes[n];
- uri_schemes[n] = NULL;
+ uri_schemes = tumbler_util_get_supported_uri_schemes ();
/* create the pixbuf thumbnailer */
thumbnailer = g_object_new (TYPE_FONT_THUMBNAILER,
@@ -141,8 +126,8 @@ font_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provider
/* add the thumbnailer to the list */
thumbnailers = g_list_append (thumbnailers, thumbnailer);
- /* free URI schemes array (not its contents) */
- g_free (uri_schemes);
+ /* free URI schemes */
+ g_strfreev (uri_schemes);
return thumbnailers;
}
diff --git a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
index 320503a..6b4fc1e 100644
--- a/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
+++ b/plugins/pixbuf-thumbnailer/pixbuf-thumbnailer-provider.c
@@ -103,34 +103,20 @@ pixbuf_thumbnailer_provider_init
(PixbufThumbnailerProvider *provider)
static GList *
pixbuf_thumbnailer_provider_get_thumbnailers (TumblerThumbnailerProvider
*provider)
{
- PixbufThumbnailer *thumbnailer;
- const gchar *const *supported_schemes;
- GHashTable *types;
- GSList *formats;
- GSList *fp;
- GList *keys;
- GList *lp;
- GList *thumbnailers = NULL;
- GStrv format_types;
- GStrv mime_types;
- GStrv uri_schemes;
- GVfs *vfs;
- guint length;
- guint n;
+ PixbufThumbnailer *thumbnailer;
+ GHashTable*types;
+ GSList*formats;
+ GSList*fp;
+ GList *keys;
+ GList *lp;
+ GList *thumbnailers = NULL;
+ GStrv format_types;
+ GStrv mime_types;
+ GStrv uri_schemes;
+ guint n;
/* determine which URI schemes are supported by GIO */
- vfs = g_vfs_get_default ();
- supported_schemes = g_vfs_get_supported_uri_schemes (vfs);
-
- /* copy the supported schemes array and add the file scheme, which for
- * some odd reason is not included by default. Bug filed on
- * http://bugzilla.gnome.org/show_bug.cgi?id=596867 */
- length = g_strv_length ((gchar **)supported_schemes);
- uri_schemes = g_new0 (gchar *, length + 1);
- uri_schemes[0] = (gchar *)file;
- for (n = 0; n length; ++n)
-uri_schemes[1+n] = (gchar *)supported_schemes[n];
- uri_schemes[n] = NULL;
+ uri_schemes = tumbler_util_get_supported_uri_schemes ();
/* create a hash table to collect unique MIME types */
types = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@@ -177,8 +163,8 @@ pixbuf_thumbnailer_provider_get_thumbnailers
(TumblerThumbnailerProvider *provid
uri-schemes, uri_schemes, mime-types,
mime_types,
NULL);
- /* free URI schemes array (not its contents) and MIME types */
- g_free
[Xfce4-commits] parole:master Revert spacings in the interface file as it brakes full screen mode
Updating branch refs/heads/master to 8fff89e99d139620fcce992508302577cb1d9442 (commit) from 4c516026911d35ba6a8d9f30bdecb4996a3e3c3b (commit) commit 8fff89e99d139620fcce992508302577cb1d9442 Author: Ali Abdallah a...@ali-xfce.org Date: Wed Sep 30 16:42:01 2009 + Revert spacings in the interface file as it brakes full screen mode data/interfaces/parole.ui | 24 ++-- parole/parole-player.c|3 ++- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index 4040253..6fe1f24 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -301,13 +301,10 @@ child object class=GtkAlignment id=alignment1 property name=visibleTrue/property -property name=top_padding1/property -property name=left_padding1/property child object class=GtkVBox id=vbox8 property name=visibleTrue/property property name=orientationvertical/property -property name=spacing5/property child object class=GtkHBox id=output property name=visibleTrue/property @@ -576,7 +573,7 @@ /child child object class=GtkButton id=leave_fs -property name=label translatable=yesgtk-leave-fullscreen/property +property name=labelgtk-leave-fullscreen/property property name=can_focusTrue/property property name=receives_defaultTrue/property property name=no_show_allTrue/property @@ -634,24 +631,15 @@ /packing /child child - object class=GtkAlignment id=alignment2 + object class=GtkNotebook id=notebook-playlist property name=visibleTrue/property -property name=top_padding6/property -property name=bottom_padding6/property -property name=left_padding4/property -property name=right_padding6/property -child - object class=GtkNotebook id=notebook-playlist -property name=visibleTrue/property -property name=can_focusTrue/property -property name=show_borderFalse/property -property name=scrollableTrue/property - /object -/child +property name=can_focusTrue/property +property name=show_borderFalse/property +property name=scrollableTrue/property /object packing property name=resizeFalse/property -property name=shrinkFalse/property +property name=shrinkTrue/property /packing /child /object diff --git a/parole/parole-player.c b/parole/parole-player.c index 1289592..8abfd64 100644 --- a/parole/parole-player.c +++ b/parole/parole-player.c @@ -488,6 +488,7 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream) gboolean seekable; player-priv-state = PAROLE_MEDIA_STATE_PLAYING; + pix = xfce_themed_icon_load (player_play, 16); if ( !pix ) @@ -536,7 +537,7 @@ parole_player_paused (ParolePlayer *player) TRACE (Player paused); -pix = xfce_themed_icon_load (gtk-media-pause, 16); +pix = xfce_themed_icon_load (GTK_STOCK_MEDIA_PAUSE, 16); parole_media_list_set_row_pixbuf (player-priv-list, player-priv-row, pix); gtk_widget_set_sensitive (player-priv-play_pause, TRUE); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-clipman-plugin:master Run make -C po update-po
Updating branch refs/heads/master to 450a978d211f12ef54e4f055b79abff4c4b47838 (commit) from 521ff7a8d6287d1c4958ad86981080619d82595e (commit) commit 450a978d211f12ef54e4f055b79abff4c4b47838 Author: Mike Massonnet mmasson...@xfce.org Date: Wed Sep 30 17:52:59 2009 +0200 Run make -C po update-po po/ar.po|6 ++- po/ast.po |6 ++- po/ca.po|6 ++- po/cs.po|6 ++- po/da.po| 85 +++- po/de.po|6 ++- po/el.po| 69 - po/en_GB.po |6 ++- po/es.po| 90 ++- po/eu.po|6 ++- po/fi.po|6 ++- po/fr.po|6 ++- po/gl.po|6 ++- po/hu.po|6 ++- po/id.po|6 ++- po/it.po|6 ++- po/ja.po|6 ++- po/lv.po|6 ++- po/nb.po|6 ++- po/nl.po|6 ++- po/pl.po|6 ++- po/pt.po|6 ++- po/pt_BR.po |6 ++- po/ru.po|6 ++- po/sk.po|6 ++- po/sq.po|6 ++- po/sv.po|6 ++- po/tr.po|6 ++- po/uk.po|6 ++- po/ur.po|6 ++- po/ur_PK.po |6 ++- po/vi.po|6 ++- po/xfce4-clipman-plugin.pot |6 ++- po/zh_CN.po |6 ++- po/zh_TW.po |6 ++- 35 files changed, 347 insertions(+), 89 deletions(-) diff --git a/po/ar.po b/po/ar.po index 25db66e..9705b37 100644 --- a/po/ar.po +++ b/po/ar.po @@ -2,7 +2,7 @@ msgid msgstr Project-Id-Version: xfce\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-09-12 10:19+0200\n +POT-Creation-Date: 2009-09-30 17:49+0200\n PO-Revision-Date: 2008-07-15 22:57+0200\n Last-Translator: Mohamed Magdy mohame...@gmail.com\n Language-Team: Arabeyes d...@arabeyes.org\n @@ -163,6 +163,10 @@ msgid Sync _selections msgstr #: ../panel-plugin/settings-dialog.glade.h:25 +msgid The pattern is always anchored within the special characters ^$ +msgstr + +#: ../panel-plugin/settings-dialog.glade.h:26 msgid You can use the substitution parameters \\\1\, \\\2\ and so on in the commands. The parameter \\\0\ represents the complete text. If you don't diff --git a/po/ast.po b/po/ast.po index 5305e55..8fdb45f 100644 --- a/po/ast.po +++ b/po/ast.po @@ -2,7 +2,7 @@ msgid msgstr Project-Id-Version: \n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-09-12 10:19+0200\n +POT-Creation-Date: 2009-09-30 17:49+0200\n PO-Revision-Date: 2009-07-13 19:54+0100\n Last-Translator: Marcos Antonio Alvarez Costales marcoscosta...@gmail.com\n Language-Team: Asturian alministrado...@softastur.org\n @@ -177,6 +177,10 @@ msgid Sync _selections msgstr Sincronizar les _seleiciones #: ../panel-plugin/settings-dialog.glade.h:25 +msgid The pattern is always anchored within the special characters ^$ +msgstr + +#: ../panel-plugin/settings-dialog.glade.h:26 msgid You can use the substitution parameters \\\1\, \\\2\ and so on in the commands. The parameter \\\0\ represents the complete text. If you don't diff --git a/po/ca.po b/po/ca.po index 877484a..7441bae 100644 --- a/po/ca.po +++ b/po/ca.po @@ -9,7 +9,7 @@ msgid msgstr Project-Id-Version: xfce4-clipman-plugin 0.8.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-09-12 10:19+0200\n +POT-Creation-Date: 2009-09-30 17:49+0200\n PO-Revision-Date: 2009-09-13 19:39+0100\n Last-Translator: Carles Muñoz Gorriz carle...@internautas.org\n Language-Team: Catalan xfce-i...@xfce.org\n @@ -182,6 +182,10 @@ msgid Sync _selections msgstr Sincronitza _seleccions #: ../panel-plugin/settings-dialog.glade.h:25 +msgid The pattern is always anchored within the special characters ^$ +msgstr + +#: ../panel-plugin/settings-dialog.glade.h:26 msgid You can use the substitution parameters \\\1\, \\\2\ and so on in the commands. The parameter \\\0\ represents the complete text. If you don't diff --git a/po/cs.po b/po/cs.po index 643354f..394d090 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-clipman-plugin 0.8.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2009-09-12 10:19+0200\n +POT-Creation-Date: 2009-09-30 17:49+0200\n PO-Revision-Date: 2009-06-07 16:20+0100\n Last-Translator: Michal Várady miko.v...@gmail.com\n Language-Team: Czech xfce-i...@xfce.org\n @@ -184,6 +184,10 @@ msgid Sync _selections msgstr _Synchronizovat výbÄry #: ../panel-plugin/settings-dialog.glade.h:25 +msgid The pattern is always anchored within the
[Xfce4-commits] xfce4-clipman-plugin|1.1.1 Creating annotated tag 1.1.1
Updating annotated tag refs/tags/1.1.1 as new annotated tag to 56861be25c0c3ddeaacdc9cea755513bad03b61d (tag) succeeds 1.1.0-12-g450a978 tagged by Mike Massonnet mmasson...@xfce.org on 2009-09-30 16:09 + Mike Massonnet (1): === Release 1.1.1 === ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Add Window Focus Current Tab
Updating branch refs/heads/master
to 3686db6f6f73c6deba1884b9f34a357596ede457 (commit)
from df88be1aff98f357839fbfe2f7ba29b1fb0bae7e (commit)
commit 3686db6f6f73c6deba1884b9f34a357596ede457
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Sep 30 22:18:17 2009 +0200
Add Window Focus Current Tab
midori/midori-browser.c | 17 +
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 074d7ed..0297525 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2695,6 +2695,10 @@ _action_window_populate_popup (GtkAction* action,
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_action_create_menu_item (
+_action_by_name (browser, TabCurrent));
+gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
+gtk_widget_show (menuitem);
+menuitem = gtk_action_create_menu_item (
_action_by_name (browser, TabPrevious));
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
@@ -4004,6 +4008,15 @@ _action_tab_next_activate (GtkAction* action,
gtk_notebook_set_current_page (GTK_NOTEBOOK (browser-notebook), n + 1);
}
+static void
+_action_tab_current_activate (GtkAction* action,
+ MidoriBrowser* browser)
+{
+GtkWidget* view = midori_browser_get_current_tab (browser);
+GtkWidget* child = gtk_bin_get_child (GTK_BIN (view));
+gtk_widget_grab_focus (child ? child : view);
+}
+
static const gchar* credits_authors[] = {
Christian Dywan christ...@twotoasts.de, NULL };
static const gchar* credits_documenters[] = {
@@ -4479,6 +4492,9 @@ static const GtkActionEntry entries[] = {
{ TabNext, GTK_STOCK_GO_FORWARD,
N_(_Next Tab), CtrlPage_Down,
N_(Switch to the next tab), G_CALLBACK (_action_tab_next_activate) },
+ { TabCurrent, NULL,
+ N_(Focus _Current Tab), CtrlHome,
+ N_(Focus the current tab), G_CALLBACK (_action_tab_current_activate) },
{ Help, NULL, N_(_Help) },
{ HelpContents, GTK_STOCK_HELP,
@@ -4744,6 +4760,7 @@ static const gchar* ui_markup =
menuitem action='ClearPrivateData'/
menuitem action='TabPrevious'/
menuitem action='TabNext'/
+menuitem action='TabCurrent'/
menuitem action='UndoTabClose'/
menuitem action='TrashEmpty'/
menuitem action='Preferences'/
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Backup the old session when resetting it in the Crash dialog
Updating branch refs/heads/master
to c848b24733635ffcaba80bb887ea5e116bc049fb (commit)
from 3686db6f6f73c6deba1884b9f34a357596ede457 (commit)
commit c848b24733635ffcaba80bb887ea5e116bc049fb
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Sep 30 22:30:19 2009 +0200
Backup the old session when resetting it in the Crash dialog
midori/main.c | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index 4f46ba6..2111c31 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1150,6 +1150,17 @@ static void
button_reset_session_clicked_cb (GtkWidget* button,
KatzeArray* session)
{
+gchar* config_file;
+GError* error;
+
+config_file = build_config_filename (session.old.xbel);
+error = NULL;
+if (!midori_array_to_file (session, config_file, xbel, error))
+{
+g_warning (_(The session couldn't be saved. %s), error-message);
+g_error_free (error);
+}
+g_free (config_file);
katze_array_clear (session);
gtk_widget_set_sensitive (button, FALSE);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Implement 'Open last session' menu item
Updating branch refs/heads/master
to 60a96b9d8b1d69d1979c9e290ab019549ef3493f (commit)
from c848b24733635ffcaba80bb887ea5e116bc049fb (commit)
commit 60a96b9d8b1d69d1979c9e290ab019549ef3493f
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Sep 30 23:02:10 2009 +0200
Implement 'Open last session' menu item
midori/main.c | 37 -
midori/midori-browser.c |9 +
2 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index 2111c31..738e7f9 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1350,6 +1350,32 @@ midori_load_extensions (gpointer data)
return FALSE;
}
+static void
+midori_browser_action_last_session_activate_cb (GtkAction* action,
+MidoriBrowser* browser)
+{
+KatzeArray* old_session = katze_array_new (KATZE_TYPE_ITEM);
+gchar* config_file = build_config_filename (session.old.xbel);
+GError* error = NULL;
+if (midori_array_from_file (old_session, config_file, xbel, error))
+{
+guint i = 0;
+KatzeItem* item;
+while ((item = katze_array_get_nth_item (old_session, i++)))
+midori_browser_add_item (browser, item);
+}
+else
+{
+g_warning (_(The session couldn't be loaded: %s\n), error-message);
+/* FIXME: Show a graphical dialog */
+g_error_free (error);
+}
+g_free (config_file);
+gtk_action_set_sensitive (action, FALSE);
+g_signal_handlers_disconnect_by_func (action,
+midori_browser_action_last_session_activate_cb, browser);
+}
+
static gboolean
midori_load_session (gpointer data)
{
@@ -1364,10 +1390,19 @@ midori_load_session (gpointer data)
gchar** command = g_object_get_data (G_OBJECT (app), execute-command);
browser = midori_app_create_browser (app);
+config_file = build_config_filename (session.old.xbel);
+if (g_file_test (config_file, G_FILE_TEST_EXISTS))
+{
+GtkActionGroup* action_group = midori_browser_get_action_group
(browser);
+GtkAction* action = gtk_action_group_get_action (action_group,
LastSession);
+g_signal_connect (action, activate,
+G_CALLBACK (midori_browser_action_last_session_activate_cb),
browser);
+gtk_action_set_sensitive (action, TRUE);
+}
midori_app_add_browser (app, browser);
gtk_widget_show (GTK_WIDGET (browser));
-config_file = build_config_filename (accels);
+katze_assign (config_file, build_config_filename (accels));
if (is_writable (config_file))
g_signal_connect_after (gtk_accel_map_get (), changed,
G_CALLBACK (accel_map_changed_cb), NULL);
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 0297525..ca88013 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2695,6 +2695,10 @@ _action_window_populate_popup (GtkAction* action,
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_action_create_menu_item (
+_action_by_name (browser, LastSession));
+gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
+gtk_widget_show (menuitem);
+menuitem = gtk_action_create_menu_item (
_action_by_name (browser, TabCurrent));
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
@@ -4495,6 +4499,9 @@ static const GtkActionEntry entries[] = {
{ TabCurrent, NULL,
N_(Focus _Current Tab), CtrlHome,
N_(Focus the current tab), G_CALLBACK (_action_tab_current_activate) },
+ { LastSession, NULL,
+ N_(Open last _session), NULL,
+ N_(Open the tabs saved in the last session), NULL },
{ Help, NULL, N_(_Help) },
{ HelpContents, GTK_STOCK_HELP,
@@ -4761,6 +4768,7 @@ static const gchar* ui_markup =
menuitem action='TabPrevious'/
menuitem action='TabNext'/
menuitem action='TabCurrent'/
+menuitem action='LastSession'/
menuitem action='UndoTabClose'/
menuitem action='TrashEmpty'/
menuitem action='Preferences'/
@@ -5219,6 +5227,7 @@ midori_browser_init (MidoriBrowser* browser)
#endif
_action_set_sensitive (browser, EncodingCustom, FALSE);
_action_set_sensitive (browser, SelectionSourceView, FALSE);
+_action_set_sensitive (browser, LastSession, FALSE);
/* Create the navigationbar */
browser-navigationbar = gtk_ui_manager_get_widget (
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] www:master Remove dbh, xarchiver and xfmedia from the project page.
Updating branch refs/heads/master to c39ae2135ba46012cfed998787c20281621fc527 (commit) from 62207d93f7857161d61a427ef1f9f9bb9dfd0183 (commit) commit c39ae2135ba46012cfed998787c20281621fc527 Author: Jérôme Guelfucci jero...@xfce.org Date: Thu Sep 24 19:31:21 2009 +0200 Remove dbh, xarchiver and xfmedia from the project page. i18n/projects/index.en.php | 25 - 1 files changed, 0 insertions(+), 25 deletions(-) diff --git a/i18n/projects/index.en.php b/i18n/projects/index.en.php index de87b30..0b4407a 100644 --- a/i18n/projects/index.en.php +++ b/i18n/projects/index.en.php @@ -146,22 +146,6 @@ Every project has it's own project page to provide additionnal information. /td /tr tr -td width=48 valign=top - img src=/images/projects/xfmedia.png alt=xfmedia width=48 height=48 / - /td - td width=33% valign=top - h3a href=/projects/xfmediaXfmedia/a/h3 - pXfmedia is a simple, easy-to-use media player based on the xine engine. - The GTK+ GUI focuses on playing and managing audio files, but, being based - on xine, supports video as well./p - /td - td width=48 valign=top - img src=/images/projects/xarchiver.png alt=xarchiver width=48 height=48 / - /td - td width=33% valign=top - h3a href=http://xarchiver.xfce.org;Archive Manager/a/h3 - pXarchiver is a GTK+2 only frontend to 7z, zip, rar, tar, bzip2, gzip, arj and rpm./p - /td td width=48 valign=top img src=/images/projects/xfce4-mixer.png alt=xfce4-mixer width=48 height=48 / /td @@ -169,8 +153,6 @@ Every project has it's own project page to provide additionnal information. h3a href=/projects/xfce4-mixer/Mixer/a/h3 pA modern sound mixer based on GStreamer./p /td - /tr - tr td width=48 valign=top img src=/images/projects/ristretto.png alt=ristretto width=48 height=48 / /td @@ -224,13 +206,6 @@ Every project has it's own project page to provide additionnal information. use Perl to write Xfce applications. /p /td td width=48 valign=top - img src=/images/projects/library.png alt=dbh width=48 height=48 / - /td - td width=33% valign=top - h3a href=http://dbh.sourceforge.net;Disk Based Hashtables/a/h3 - pDBH is a library to create Disk Based Hashtables on POSIX systems./p - /td - td width=48 valign=top img src=/images/projects/xfce4-dev-tools.png alt=xfce4-dev-tools width=48 height=48 / /td td valign=top ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] www:master Refactor the development page. Some links are still missing.
Updating branch refs/heads/master to b79fc62f90beb56c3463a697e05884609e77c22e (commit) from c39ae2135ba46012cfed998787c20281621fc527 (commit) commit b79fc62f90beb56c3463a697e05884609e77c22e Author: Jérôme Guelfucci jero...@xfce.org Date: Fri Sep 25 21:45:59 2009 +0200 Refactor the development page. Some links are still missing. i18n/development/index.en.php | 117 +++-- 1 files changed, 65 insertions(+), 52 deletions(-) diff --git a/i18n/development/index.en.php b/i18n/development/index.en.php index 12324be..2ce3f30 100644 --- a/i18n/development/index.en.php +++ b/i18n/development/index.en.php @@ -1,52 +1,65 @@ -h1Development/h1 -pIf you are looking for a way to contribute to Xfce, -please consider joining the a href=../community/listsmailing lists/a and a href=http://forum.xfce.org;forum/a regarding one of these items./p - -table width=99% border=0 cellspacing=10 cellpadding=0 -tr - td width=48 valign=top - img src=/images/development/i18n.png alt=i18n width=48 height=48 / - /td - td width=33% valign=top - h3a href=http://i18n.xfce.org;Translations/a/h3 - pXfce is translated in many different languages, if your language of choice is missing, please help us translate Xfce./p - /td - td width=48 valign=top - img src=/images/development/docs.png alt=docs width=48 height=48 / - /td - td width=33% valign=top - h3a href=/documentation/Documentation/a/h3 - pWe always welcome additional documentation about Xfce./p - /td - td width=48 valign=top - img src=/images/development/artwork.png alt=art width=48 height=48 / - /td - td width=33% valign=top - h3a href=/about/artworkArtwork/a/h3 - pWant to create your own Xfce look? You can by following our step-by-step example a href=http://wiki.xfce.org/howto;howto's/a. Or you can just take a look at a href=http://www.xfce-look.org/;xfce-look/a to see how others have customized their Xfce./p - /td - /tr - tr - td width=48 valign=top - img src=/images/development/goodies.png alt=goodies width=48 height=48 / - /td - td width=33% valign=top - h3a href=http://goodies.xfce.org;Goodies/a/h3 - pThe Xfce Goodies Project includes additional software and artwork that are related to the Xfce desktop, but not part of the official release./p - /td - td width=48 valign=top - img src=/images/development/devel.png alt=dev width=48 height=48 / - /td - td width=33% valign=top - h3a href=http://foo-projects.org/mailman/listinfo/xfce4-dev;Development/a/h3 - pFeel free to join us developing the next major branch of Xfce, or fix bugs in existing releases./p - /td - td width=48 valign=top - img src=/images/development/docs.png alt=docs width=48 height=48 / - /td - td width=33% valign=top - h3a href=http://wiki.xfce.org;Wiki/a/h3 - pEverybody is able to improve and extend the content of the Xfce a href=http://wiki.xfce.org;wiki/a./p - /td - /tr -/table +h2Development/h2 + +p +Xfce welcomes any kind of contribution. We need every skills, not +only coders: translations, documentation or artwork are also very + important and need your help! +/p + +h3Contribute to the development of the Xfce core/h3 + +img src=/images/development/devel.png alt=dev width=48 height=48 / + +p +Feel free to join us developing the next major branch of Xfce, or fix bugs in existing releases. The +a href=http://bugzilla.xfce.org;bugzilla/a and the a href=roadmap/a are a good start to get +ideas on what needs some love. +/p + +p +If you need more details or want to get news about the current development, suscribe the +a href=http://foo-projects.org/mailman/listinfo/xfce4-dev;development mailing list/a. +The a href=http://wiki.xfce.org/;Xfce wiki/a also contains a lot of additionnal information. +/p + +h3Goodies/h3 + +img src=/images/development/goodies.png alt=goodies width=48 height=48 / + +p +The a href=http://goodies.xfce.org;Xfce goodies/a are independant projects related to the Xfce desktop, but they are not part of the +official release. They also need your help: you should contact the maintainer of the project you want to contribute to, but you can +also start your own project. The a href=Goodies development mailing list/a is there for you if you have any questions. +/p + +h3Translations/h3
[Xfce4-commits] www:master Add the libraries and bindings to the development page.
Updating branch refs/heads/master to 1c82372ed7ed14217f8c086fe187dd97ed6f90e0 (commit) from e9b030646d3dbc6ed38e86aec2bf0557d16b3e07 (commit) commit 1c82372ed7ed14217f8c086fe187dd97ed6f90e0 Author: Jérôme Guelfucci jero...@xfce.org Date: Thu Oct 1 00:21:39 2009 +0200 Add the libraries and bindings to the development page. i18n/development/index.en.php | 30 ++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/i18n/development/index.en.php b/i18n/development/index.en.php index 97bf092..bc1da56 100644 --- a/i18n/development/index.en.php +++ b/i18n/development/index.en.php @@ -55,3 +55,33 @@ We need volounteers for the a href=/about/artworkXfce Artwork/a. Design ne step-by-step example a href=http://wiki.xfce.org/howto;howto's/a. Or you can just take a look at a href=http://www.xfce-look.org/;Xfce Look/a to see how others have customized their Xfce desktop. /p + +h3 class=dev style=background-image: url(/images/projects/library.png);The Xfce framework/h3 + +p +Xfce provides a framework to develop applications which integrate efficiently in the Xfce desktop environment. This +framework also eases the development of applications by providing common and useful functions which are not present +in the Glib/Gtk stack. +/p + +p +The a href=http://foo-projects.org/%7Ebenny/projects/xfce4-dev-tools/;Xfce developer tools/a +provide a collection of scripts and M4 macros that are required to build the Xfce core desktop components. +/p + +p +The a href=/projects/libraries/three base libraries of Xfce/a (libxfce4util, libxfcegui4 and libxfce4menu) are used by almost +any Xfce application. They provide convenience functions, customized widgets as the titled dialogs or +implementations of specifications. +/p + +p +While the core Xfce libraries are targeted at desktop development, a href=/projects/exo/exo/a is targeted at application developement. It +provides custom widgets, a job framework and a lot of useful functions for developing applications. +/p + +p +Moreover, we have a href=http://pyxfce.xfce.org/;Python/a, +a href=http://spuriousinterrupt.org/projects/xfce4-perl;Perl/a and +a href=http://xfc.xfce.org/;C++/a bindings for those libraries. +/p ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] www:master Add a few CSS rules to make the development page nicer.
Updating branch refs/heads/master
to e9b030646d3dbc6ed38e86aec2bf0557d16b3e07 (commit)
from b79fc62f90beb56c3463a697e05884609e77c22e (commit)
commit e9b030646d3dbc6ed38e86aec2bf0557d16b3e07
Author: Jérôme Guelfucci jero...@xfce.org
Date: Thu Oct 1 00:07:14 2009 +0200
Add a few CSS rules to make the development page nicer.
i18n/development/index.en.php | 34 +-
layout/css/classes.css|7 +++
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/i18n/development/index.en.php b/i18n/development/index.en.php
index 2ce3f30..97bf092 100644
--- a/i18n/development/index.en.php
+++ b/i18n/development/index.en.php
@@ -6,14 +6,12 @@ only coders: translations, documentation or artwork are also
very
important and need your help!
/p
-h3Contribute to the development of the Xfce core/h3
-
-img src=/images/development/devel.png alt=dev width=48 height=48 /
+h3 class=dev style=background-image:
url(/images/development/devel.png);Contribute to the development of the Xfce
core/h3
p
Feel free to join us developing the next major branch of Xfce, or fix bugs in
existing releases. The
-a href=http://bugzilla.xfce.org;bugzilla/a and the a href=roadmap/a
are a good start to get
-ideas on what needs some love.
+a href=http://bugzilla.xfce.org;bugzilla/a and the a
href=http://wiki.xfce.org/releng/4.8/schedule;roadmap/a
+are a good start to get ideas on what needs some love.
/p
p
@@ -22,19 +20,17 @@ If you need more details or want to get news about the
current development, susc
The a href=http://wiki.xfce.org/;Xfce wiki/a also contains a lot of
additionnal information.
/p
-h3Goodies/h3
-
-img src=/images/development/goodies.png alt=goodies width=48
height=48 /
+h3 class=dev style=background-image:
url(/images/development/goodies.png);Goodies/h3
p
-The a href=http://goodies.xfce.org;Xfce goodies/a are independant
projects related to the Xfce desktop, but they are not part of the
-official release. They also need your help: you should contact the maintainer
of the project you want to contribute to, but you can
-also start your own project. The a href=Goodies development mailing
list/a is there for you if you have any questions.
+The a href=http://goodies.xfce.org;Xfce goodies/a are independant
projects related to the
+Xfce desktop, but they are not part of the official release. They also need
your help: you should
+contact the maintainer of the project you want to contribute to, but you can
also start your own project.
+The a href=http://foo-projects.org/mailman/listinfo/goodies-dev/;Goodies
development mailing list/a
+is there for you if you have any questions.
/p
-h3Translations/h3
-
-img src=/images/development/i18n.png alt=i18n width=48 height=48 /
+h3 class=dev style=background-image:
url(/images/development/i18n.png);Translations/h3
p
Translations are currently managed using a
href=http://wiki.xfce.org/translations/transifex;Transifex/a.
@@ -44,9 +40,7 @@ to the translations. If you have any questions, the
is here for you!
/p
-h3Documentation/h3
-
-img src=/images/development/docs.png alt=docs width=48 height=48 /
+h3 class=dev style=background-image:
url(/images/development/docs.png);Documentation/h3
p
As you may have noticed, the a href=/documentation/Xfce documentation/a
needs a lot of work.
@@ -54,12 +48,10 @@ A new documentation is being worked on, if you want to join
this new effort, ple
a href=http://foo-projects.org/mailman/listinfo/xfce4-dev;development
mailing list/a.
/p
-h3Artwork/h3
-
-img src=/images/development/artwork.png alt=art width=48 height=48 /
+h3 class=dev style=background-image:
url(/images/development/artwork.png);Artwork/h3
p
We need volounteers for the a href=/about/artworkXfce Artwork/a. Design
new icons, wallpapers, or Xfwm4 themes by following our
step-by-step example a href=http://wiki.xfce.org/howto;howto's/a. Or you
can just take a look at
-a href=http://www.xfce-look.org/;xfce-look/a to see how others have
customized their Xfce desktop.
+a href=http://www.xfce-look.org/;Xfce Look/a to see how others have
customized their Xfce desktop.
/p
diff --git a/layout/css/classes.css b/layout/css/classes.css
index 947b567..4f91df5 100644
--- a/layout/css/classes.css
+++ b/layout/css/classes.css
@@ -85,3 +85,10 @@
.center {
text-align:center;
}
+
+.dev {
+ background-repeat: no-repeat;
+ background-position: 0 50%;
+ padding-left: 60px;
+ line-height: 48px;
+}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] www:master Remove the library and bindings from the project page.
Updating branch refs/heads/master to 00dccb765f4eeda7ce014dd1889c3cc2d3322a9a (commit) from 1c82372ed7ed14217f8c086fe187dd97ed6f90e0 (commit) commit 00dccb765f4eeda7ce014dd1889c3cc2d3322a9a Author: Jérôme Guelfucci jero...@xfce.org Date: Thu Oct 1 00:22:44 2009 +0200 Remove the library and bindings from the project page. i18n/projects/index.en.php | 46 1 files changed, 0 insertions(+), 46 deletions(-) diff --git a/i18n/projects/index.en.php b/i18n/projects/index.en.php index 0b4407a..07183a8 100644 --- a/i18n/projects/index.en.php +++ b/i18n/projects/index.en.php @@ -170,52 +170,6 @@ Every project has it's own project page to provide additionnal information. /tr /table -h2 id=frameworkFramework/h2 -table width=99% border=0 cellpadding=0 cellspacing=10 - tr - td width=48 valign=top - img src=/images/projects/library.png alt=exo width=48 height=48 / - /td - td width=33% valign=top - h3a href=/projects/exo/Exo/a/h3 - pThe core Xfce libraries are targeted at desktop development, exo is targeted at application developement./p - /td - td width=48 valign=top - img src=/images/projects/library.png alt=pyxfce width=48 height=48 / - /td - td width=33% valign=top - h3a href=http://pyxfce.xfce.org;Python Bindings/a/h3 - pPython bindings for Xfce. They allow you to create programs using the Xfce libraries more easily./p - /td - td width=48 valign=top - img src=/images/projects/library.png alt=xfc width=48 height=48 / - /td - td width=33% valign=top - h3a href=http://xfc.xfce.org;Xfce Foundation Classes/a/h3 - pThe Xfce Foundation Classes is a set of integrated C++ classes for developing Xfce - applications on UNIX-like operating systems such as Linux./p - /td - /tr - tr - td width=48 valign=top - img src=/images/projects/library.png alt=xfce4-perl width=48 height=48 / - /td - td width=33% valign=top - h3a href=http://spuriousinterrupt.org/projects/xfce4-perl;Perl Bindings/a/h3 - pPerl bindings for Xfce. If you are old-fashioned or just don't like C and Python, you can - use Perl to write Xfce applications. /p - /td - td width=48 valign=top - img src=/images/projects/xfce4-dev-tools.png alt=xfce4-dev-tools width=48 height=48 / - /td - td valign=top - h3a href=http://foo-projects.org/~benny/projects/xfce4-dev-tools/;Xfce Development Tools/a/h3 - pThe Xfce developer tools provide a collection of scripts and M4 macros that - are required to build the Xfce core desktop components./p - /td - /tr -/table - h2 id=artArt and Graphics/h2 table width=99% border=0 cellpadding=0 cellspacing=10 tr ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Show 'Send a message to mail address' when hovering email links
Updating branch refs/heads/master
to 1535bc89708ab1b6c83ecea931549c85767c3178 (commit)
from 037be4dda44e622e2c33728e2cd55c4579c4d8df (commit)
commit 1535bc89708ab1b6c83ecea931549c85767c3178
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Sep 30 23:54:40 2009 +0200
Show 'Send a message to mail address' when hovering email links
midori/midori-view.c |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index ed06281..109769f 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1077,7 +1077,14 @@ webkit_web_view_hovering_over_link_cb (WebKitWebView*
web_view,
MidoriView*view)
{
katze_assign (view-link_uri, g_strdup (link_uri));
-g_object_set (G_OBJECT (view), statusbar-text, link_uri, NULL);
+if (link_uri g_str_has_prefix (link_uri, mailto:;))
+{
+gchar* text = g_strdup_printf (_(Send a message to %s),
link_uri[7]);
+g_object_set (G_OBJECT (view), statusbar-text, text, NULL);
+g_free (text);
+}
+else
+g_object_set (G_OBJECT (view), statusbar-text, link_uri, NULL);
}
#define MIDORI_KEYS_MODIFIER_MASK (GDK_SHIFT_MASK | GDK_CONTROL_MASK \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Offer 'Send message to mail address' for selections
Updating branch refs/heads/master
to 037be4dda44e622e2c33728e2cd55c4579c4d8df (commit)
from 60a96b9d8b1d69d1979c9e290ab019549ef3493f (commit)
commit 037be4dda44e622e2c33728e2cd55c4579c4d8df
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Sep 30 23:38:18 2009 +0200
Offer 'Send message to mail address' for selections
midori/midori-view.c | 38 +-
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index f3c17ba..ed06281 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1404,10 +1404,20 @@ midori_web_view_menu_new_tab_activate_cb (GtkWidget*
widget,
else
{
gchar* data = (gchar*)g_object_get_data (G_OBJECT (widget), uri);
-gchar* uri = sokoke_magic_uri (data, NULL);
-g_signal_emit (view, signals[NEW_TAB], 0, uri,
- view-open_tabs_in_the_background);
-g_free (uri);
+if (strchr (data, '@'))
+{
+gchar* uri = g_strconcat (mailto:;, data, NULL);
+sokoke_show_uri (gtk_widget_get_screen (widget),
+ uri, GDK_CURRENT_TIME, NULL);
+g_free (uri);
+}
+else
+{
+gchar* uri = sokoke_magic_uri (data, NULL);
+g_signal_emit (view, signals[NEW_TAB], 0, uri,
+ view-open_tabs_in_the_background);
+g_free (uri);
+}
}
}
@@ -1753,12 +1763,22 @@ webkit_web_view_populate_popup_cb (WebKitWebView*
web_view,
g_list_free (items);
#endif
-if (view-selected_text strchr (view-selected_text, '.')
- !strchr (view-selected_text, ' '))
+g_strstrip (view-selected_text);
+if (view-selected_text !strchr (view-selected_text, ' ')
+ strchr (view-selected_text, '.'))
{
-menuitem = midori_view_insert_menu_item (menu_shell, -1,
-_(Open Address in New _Tab), GTK_STOCK_JUMP_TO,
-G_CALLBACK (midori_web_view_menu_new_tab_activate_cb), widget);
+if (strchr (view-selected_text, '@'))
+{
+gchar* text = g_strdup_printf (_(Send a message to %s),
view-selected_text);
+menuitem = midori_view_insert_menu_item (menu_shell, -1,
+text, GTK_STOCK_JUMP_TO,
+G_CALLBACK (midori_web_view_menu_new_tab_activate_cb),
widget);
+g_free (text);
+}
+else
+menuitem = midori_view_insert_menu_item (menu_shell, -1,
+_(Open Address in New _Tab), GTK_STOCK_JUMP_TO,
+G_CALLBACK (midori_web_view_menu_new_tab_activate_cb),
widget);
g_object_set_data (G_OBJECT (menuitem), uri,
view-selected_text);
}
/* FIXME: view selection source */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master When hovering menu items, show descriptions in the statusbar
Updating branch refs/heads/master
to 2d1481699ad7c97171cd31ff95b2a781e8fd9876 (commit)
from 1535bc89708ab1b6c83ecea931549c85767c3178 (commit)
commit 2d1481699ad7c97171cd31ff95b2a781e8fd9876
Author: Christian Dywan christ...@twotoasts.de
Date: Wed Sep 30 23:57:36 2009 +0200
When hovering menu items, show descriptions in the statusbar
midori/midori-browser.c | 107 ++-
1 files changed, 105 insertions(+), 2 deletions(-)
diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index ca88013..1cbcabb 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -2520,12 +2520,46 @@ midori_browser_toolbar_popup_context_menu_cb
(GtkWidget* widget,
}
static void
+midori_browser_menu_item_select_cb (GtkWidget* menuitem,
+MidoriBrowser* browser)
+{
+GtkAction* action = gtk_widget_get_action (menuitem);
+const gchar* tooltip = action ? gtk_action_get_tooltip (action) : NULL;
+if (!tooltip)
+{
+/* This is undocumented object data, used by KatzeArrayAction. */
+KatzeItem* item = g_object_get_data (G_OBJECT (menuitem), KatzeItem);
+if (item)
+tooltip = katze_item_get_uri (item);
+}
+_midori_browser_set_statusbar_text (browser, tooltip);
+}
+
+static void
+midori_browser_menu_item_deselect_cb (GtkWidget* menuitem,
+ MidoriBrowser* browser)
+{
+_midori_browser_set_statusbar_text (browser, NULL);
+}
+
+static void
_action_trash_populate_popup (GtkAction* action,
GtkMenu* menu,
MidoriBrowser* browser)
{
+GList* children = gtk_container_get_children (GTK_CONTAINER (menu));
+guint i = 0;
GtkWidget* menuitem;
+while ((menuitem = g_list_nth_data (children, i++)))
+{
+g_signal_connect (menuitem, select,
+G_CALLBACK (midori_browser_menu_item_select_cb), browser);
+g_signal_connect (menuitem, deselect,
+G_CALLBACK (midori_browser_menu_item_deselect_cb), browser);
+}
+g_list_free (children);
+
menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
@@ -2573,7 +2607,18 @@ _action_history_populate_popup (GtkAction* action,
GtkMenu* menu,
MidoriBrowser* browser)
{
-/* Nothing to do */
+GList* children = gtk_container_get_children (GTK_CONTAINER (menu));
+guint i = 0;
+GtkWidget* menuitem;
+
+while ((menuitem = g_list_nth_data (children, i++)))
+{
+g_signal_connect (menuitem, select,
+G_CALLBACK (midori_browser_menu_item_select_cb), browser);
+g_signal_connect (menuitem, deselect,
+G_CALLBACK (midori_browser_menu_item_deselect_cb), browser);
+}
+g_list_free (children);
}
static void
@@ -2589,8 +2634,19 @@ _action_bookmarks_populate_popup (GtkAction* action,
GtkMenu* menu,
MidoriBrowser* browser)
{
+GList* children = gtk_container_get_children (GTK_CONTAINER (menu));
+guint i = 0;
GtkWidget* menuitem;
+while ((menuitem = g_list_nth_data (children, i++)))
+{
+g_signal_connect (menuitem, select,
+G_CALLBACK (midori_browser_menu_item_select_cb), browser);
+g_signal_connect (menuitem, deselect,
+G_CALLBACK (midori_browser_menu_item_deselect_cb), browser);
+}
+g_list_free (children);
+
if (katze_array_get_nth_item (browser-bookmarks, 0))
{
menuitem = gtk_separator_menu_item_new ();
@@ -2691,7 +2747,20 @@ _action_window_populate_popup (GtkAction* action,
GtkMenu* menu,
MidoriBrowser* browser)
{
-GtkWidget* menuitem = gtk_separator_menu_item_new ();
+GList* children = gtk_container_get_children (GTK_CONTAINER (menu));
+guint i = 0;
+GtkWidget* menuitem;
+
+while ((menuitem = g_list_nth_data (children, i++)))
+{
+g_signal_connect (menuitem, select,
+G_CALLBACK (midori_browser_menu_item_select_cb), browser);
+g_signal_connect (menuitem, deselect,
+G_CALLBACK (midori_browser_menu_item_deselect_cb), browser);
+}
+g_list_free (children);
+
+menuitem = gtk_separator_menu_item_new ();
gtk_menu_shell_prepend (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
menuitem = gtk_action_create_menu_item (
@@ -4935,6 +5004,36 @@ midori_browser_accel_switch_tab_activate_cb
(GtkAccelGroup* accel_group,
}
static void
+midori_browser_ui_manager_connect_proxy_cb (GtkUIManager* ui_manager,
+GtkAction* action,
+
