[Xfce4-commits] midori:master Reset the statusbar text (in the location) when leaving the view
Updating branch refs/heads/master
to d5ed3e9b287714a90ac087e0e6872a94adf04999 (commit)
from ba1084d2360ad9829a8cdbc65eb21db4dd61a448 (commit)
commit d5ed3e9b287714a90ac087e0e6872a94adf04999
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Sep 22 23:58:16 2009 +0200
Reset the statusbar text (in the location) when leaving the view
midori/midori-view.c | 11 +++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/midori/midori-view.c b/midori/midori-view.c
index 714e1ab..d884af9 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -973,6 +973,15 @@ webkit_web_view_statusbar_text_changed_cb (WebKitWebView*
web_view,
g_object_set (G_OBJECT (view), statusbar-text, text, NULL);
}
+static gboolean
+midori_view_web_view_leave_notify_event_cb (WebKitWebView*web_view,
+GdkEventCrossing* event,
+MidoriView* view)
+{
+g_object_set (G_OBJECT (view), statusbar-text, NULL, NULL);
+return FALSE;
+}
+
static void
webkit_web_view_hovering_over_link_cb (WebKitWebView* web_view,
const gchar* tooltip,
@@ -2458,6 +2467,8 @@ midori_view_construct_web_view (MidoriView* view)
#endif
signal::status-bar-text-changed,
webkit_web_view_statusbar_text_changed_cb, view,
+ signal::leave-notify-event,
+ midori_view_web_view_leave_notify_event_cb, view,
signal::hovering-over-link,
webkit_web_view_hovering_over_link_cb, view,
signal::button-press-event,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Be sure to reload lists as they are added
Updating branch refs/heads/master
to a8a0ff625e1abe325f8369980704a4eb1d88f393 (commit)
from d5ed3e9b287714a90ac087e0e6872a94adf04999 (commit)
commit a8a0ff625e1abe325f8369980704a4eb1d88f393
Author: Alexander Butenko a.bute...@gmail.com
Date: Wed Sep 23 19:22:01 2009 +0200
Be sure to reload lists as they are added
extensions/adblock.c | 124 +-
1 files changed, 72 insertions(+), 52 deletions(-)
diff --git a/extensions/adblock.c b/extensions/adblock.c
index 70624ad..03e2a0b 100644
--- a/extensions/adblock.c
+++ b/extensions/adblock.c
@@ -25,6 +25,9 @@
static GHashTable* pattern = NULL;
static gchar* blockcss = ;
+static GHashTable*
+adblock_parse_file (gchar* path);
+
static gchar *
adblock_fixup_regexp (gchar* src)
{
@@ -66,6 +69,60 @@ adblock_fixup_regexp (gchar* src)
}
static void
+adblock_download_notify_status_cb (WebKitDownload* download,
+ GParamSpec* pspec,
+ gchar* path)
+{
+pattern = adblock_parse_file (path);
+/* g_object_unref (download); */
+}
+
+static void
+adblock_reload_rules(MidoriExtension* extension)
+{
+gchar** filters;
+gchar* folder;
+guint i = 0;
+filters = midori_extension_get_string_list (extension, filters, NULL);
+folder = g_build_filename (g_get_user_cache_dir (), PACKAGE_NAME,
+ adblock, NULL);
+g_mkdir_with_parents (folder, 0700);
+
+if (!filters)
+return;
+
+pattern = NULL;
+blockcss = ;
+
+while (filters[i++] != NULL)
+{
+gchar* filename = g_compute_checksum_for_string (G_CHECKSUM_MD5,
+ filters[i - 1], -1);
+gchar* path = g_build_filename (folder, filename, NULL);
+if (!g_file_test (path, G_FILE_TEST_EXISTS))
+{
+WebKitNetworkRequest* request;
+WebKitDownload* download;
+gchar* destination = g_filename_to_uri (path, NULL, NULL);
+request = webkit_network_request_new (filters[i -1]);
+download = webkit_download_new (request);
+g_object_unref (request);
+webkit_download_set_destination_uri (download, destination);
+g_free (destination);
+g_signal_connect (download, notify::status,
+G_CALLBACK (adblock_download_notify_status_cb), path);
+webkit_download_start (download);
+}
+else
+pattern = adblock_parse_file (path);
+g_free (path);
+g_free (filename);
+}
+g_strfreev (filters);
+g_free (folder);
+}
+
+static void
adblock_browser_populate_tool_menu_cb (MidoriBrowser* browser,
GtkWidget* menu,
MidoriExtension* extension);
@@ -91,17 +148,25 @@ adblock_preferences_model_row_changed_cb (GtkTreeModel*
model,
gsize length = gtk_tree_model_iter_n_children (model, NULL);
gchar** filters = g_new (gchar*, length + 1);
guint i = 0;
+gboolean need_reload = FALSE;
if (gtk_tree_model_iter_children (model, iter, NULL))
do
{
gchar* filter;
gtk_tree_model_get (model, iter, 0, filter, -1);
-filters[i++] = filter;
+if (filter filter[0] filter[1] filter[2])
+{
+filters[i++] = filter;
+need_reload = TRUE;
+}
+g_free (filter);
}
while (gtk_tree_model_iter_next (model, iter));
filters[length] = NULL;
midori_extension_set_string_list (extension, filters, filters, length);
+if (need_reload)
+adblock_reload_rules (extension);
}
static void
@@ -318,7 +383,7 @@ adblock_resource_request_starting_cb (WebKitWebView*
web_view,
MidoriView*view)
{
const gchar* uri = webkit_network_request_get_uri (request);
-if (!strncmp(uri, data, 4))
+if (!strncmp (uri, data, 4))
return;
if (g_hash_table_find (pattern, (GHRFunc) adblock_is_matched, (char*)uri))
{
@@ -384,7 +449,8 @@ adblock_app_add_browser_cb (MidoriApp* app,
{
if (pattern)
{
- midori_browser_foreach (browser,
(GtkCallback)adblock_add_tab_foreach_cb, browser);
+midori_browser_foreach (browser,
+(GtkCallback)adblock_add_tab_foreach_cb, browser);
g_signal_connect (browser, add-tab, G_CALLBACK (adblock_add_tab_cb),
0);
}
g_signal_connect (browser, populate-tool-menu,
@@ -506,15 +572,6 @@ adblock_parse_file (gchar* path)
}
static void
-adblock_download_notify_status_cb (WebKitDownload* download,
- GParamSpec* pspec,
- gchar* path)
-{
-pattern = adblock_parse_file (path);
-/* g_object_unref
[Xfce4-commits] midori:master Merge userstyles into the userscript panel
Updating branch refs/heads/master
to ba1084d2360ad9829a8cdbc65eb21db4dd61a448 (commit)
from b3817bfc522869952397a853cfaf4853366c27de (commit)
commit ba1084d2360ad9829a8cdbc65eb21db4dd61a448
Author: Christian Dywan christ...@twotoasts.de
Date: Tue Sep 22 23:46:51 2009 +0200
Merge userstyles into the userscript panel
midori/main.c |5 --
midori/midori-stock.h |3 +-
midori/sokoke.c|1 -
panels/midori-addons.c | 97 ++-
4 files changed, 30 insertions(+), 76 deletions(-)
diff --git a/midori/main.c b/midori/main.c
index 109b5a7..4f46ba6 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -960,11 +960,6 @@ midori_app_add_browser_cb (MidoriApp* app,
gtk_widget_show (addon);
midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon));
-/* Userstyles */
-addon = midori_addons_new (MIDORI_ADDON_USER_STYLES, GTK_WIDGET (browser));
-gtk_widget_show (addon);
-midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon));
-
/* Plugins */
addon = g_object_new (MIDORI_TYPE_PLUGINS, app, app, NULL);
gtk_widget_show (addon);
diff --git a/midori/midori-stock.h b/midori/midori-stock.h
index 2ee090d..5e5f86a 100644
--- a/midori/midori-stock.h
+++ b/midori/midori-stock.h
@@ -28,7 +28,6 @@
#define STOCK_WEB_BROWSERweb-browser
#define STOCK_NEWS_FEED news-feed
#define STOCK_STYLE gnome-settings-theme
-#define STOCK_STYLES gnome-settings-theme
#define STOCK_TRANSFER package
#define STOCK_TRANSFERS package
#define STOCK_PLUGINSGTK_STOCK_CONVERT
@@ -38,7 +37,7 @@
#define STOCK_IMAGE gnome-mime-image
#define STOCK_NETWORK_OFFLINEnetwork-offline
#define STOCK_SCRIPT stock_script
-#define STOCK_SCRIPTSstock_script
+#define STOCK_SCRIPTSgnome-settings-theme
#define STOCK_SEND stock_mail-send
#define STOCK_TAB_NEWstock_new-tab
#define STOCK_USER_TRASH gnome-stock-trash
diff --git a/midori/sokoke.c b/midori/sokoke.c
index 1bc9aa1..0032aaf 100644
--- a/midori/sokoke.c
+++ b/midori/sokoke.c
@@ -866,7 +866,6 @@ sokoke_register_stock_items (void)
{ STOCK_HISTORY,N_(_History), 0, 0, GTK_STOCK_SORT_ASCENDING
},
{ STOCK_HOMEPAGE, N_(_Homepage), 0, 0, GTK_STOCK_HOME },
{ STOCK_SCRIPTS,N_(_Userscripts), 0, 0, GTK_STOCK_EXECUTE },
-{ STOCK_STYLES, N_(User_styles), 0, 0,
GTK_STOCK_SELECT_COLOR },
{ STOCK_TAB_NEW,N_(New _Tab), 0, 0, GTK_STOCK_ADD },
{ STOCK_TRANSFERS, N_(_Transfers), 0, 0, GTK_STOCK_SAVE },
{ STOCK_PLUGINS,N_(Netscape p_lugins), 0, 0,
GTK_STOCK_CONVERT },
diff --git a/panels/midori-addons.c b/panels/midori-addons.c
index db30288..cb81b01 100644
--- a/panels/midori-addons.c
+++ b/panels/midori-addons.c
@@ -29,7 +29,6 @@ struct _MidoriAddons
{
GtkVBox parent_instance;
-MidoriAddonKind kind;
GtkWidget* web_widget;
GtkWidget* toolbar;
GtkWidget* treeview;
@@ -137,23 +136,13 @@ midori_addons_class_init (MidoriAddonsClass* class)
static const gchar*
midori_addons_get_label (MidoriViewable* viewable)
{
-if (MIDORI_ADDONS (viewable)-kind == MIDORI_ADDON_USER_SCRIPTS)
-return _(Userscripts);
-else if (MIDORI_ADDONS (viewable)-kind == MIDORI_ADDON_USER_STYLES)
-return _(Userstyles);
-else
-return NULL;
+return _(Userscripts);
}
static const gchar*
midori_addons_get_stock_id (MidoriViewable* viewable)
{
-if (MIDORI_ADDONS (viewable)-kind == MIDORI_ADDON_USER_SCRIPTS)
-return STOCK_SCRIPTS;
-else if (MIDORI_ADDONS (viewable)-kind == MIDORI_ADDON_USER_STYLES)
-return STOCK_STYLES;
-else
-return NULL;
+return STOCK_SCRIPTS;
}
static void
@@ -175,7 +164,7 @@ midori_addons_set_property (GObject* object,
switch (prop_id)
{
case PROP_KIND:
-addons-kind = g_value_get_enum (value);
+/* Ignored */
break;
case PROP_WEB_WIDGET:
katze_object_assign (addons-web_widget, g_value_dup_object (value));
@@ -197,7 +186,7 @@ midori_addons_get_property (GObject*object,
switch (prop_id)
{
case PROP_KIND:
-g_value_set_enum (value, addons-kind);
+g_value_set_enum (value, MIDORI_ADDON_USER_SCRIPTS);
break;
case PROP_WEB_WIDGET:
g_value_set_object (value, addons-web_widget);
@@ -208,57 +197,31 @@ midori_addons_get_property (GObject*object,
}
}
-static const gchar*
-_addons_get_folder (MidoriAddons* addons)
-{
-switch (addons-kind)
-{
-case MIDORI_ADDON_USER_SCRIPTS:
-return scripts;
-case MIDORI_ADDON_USER_STYLES:
-return styles;
-default:
-return NULL;
-}
-}
-
-static const gchar*
-_addons_get_extension (MidoriAddons* addons)
[Xfce4-commits] xfce4-notes-plugin:master l10n: Updates to Hungarian (hu) translation
Updating branch refs/heads/master to 493219ec02c833cbec3c8e10114df8873d86582d (commit) from 51401e6ebe6549ae3d3816911fb7f1dc1ae0099c (commit) commit 493219ec02c833cbec3c8e10114df8873d86582d Author: Gabor Kelemen kelem...@gnome.hu Date: Wed Sep 23 21:25:36 2009 + l10n: Updates to Hungarian (hu) translation Transmitted-via: Transifex (translations.xfce.org) po/hu.po | 21 + 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/po/hu.po b/po/hu.po index 1d9f307..f995a70 100644 --- a/po/hu.po +++ b/po/hu.po @@ -9,9 +9,9 @@ msgstr Project-Id-Version: xfce4-notes-plugin\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2009-09-20 14:53+0200\n -PO-Revision-Date: 2009-09-20 14:55+0200\n +PO-Revision-Date: 2009-09-23 23:26+0200\n Last-Translator: Gabor Kelemen kelemeng at gnome dot hu\n -Language-Team: Hungarian gnome at gnome dot hu\n +Language-Team: Hungarian gnome at fsf dot hu\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n @@ -116,11 +116,11 @@ msgstr Jegyzetek elrejtése a feladatsávról #. Show navigation bar #: ../panel-plugin/xfce4-notes-settings.c:126 msgid Show the automatic navigation bar -msgstr +msgstr Automatikus navigációs sáv megjelenÃtése #: ../panel-plugin/xfce4-notes-settings.c:136 msgid Tabs position: -msgstr +msgstr Tabok helye: #: ../panel-plugin/xfce4-notes-settings.c:146 msgid Background: @@ -144,25 +144,24 @@ msgid Size: msgstr Méret: #: ../panel-plugin/xfce4-notes-settings.c:209 -#, fuzzy msgid None -msgstr Jegyzetek +msgstr Nincs #: ../panel-plugin/xfce4-notes-settings.c:210 msgid Top -msgstr +msgstr Fent #: ../panel-plugin/xfce4-notes-settings.c:211 msgid Right -msgstr +msgstr Jobbra #: ../panel-plugin/xfce4-notes-settings.c:212 msgid Bottom -msgstr +msgstr Lent #: ../panel-plugin/xfce4-notes-settings.c:213 msgid Left -msgstr +msgstr Balra #: ../panel-plugin/xfce4-notes-settings.c:229 msgid Small @@ -216,5 +215,3 @@ msgstr Egyéni⦠msgid Background Color msgstr HáttérszÃn -#~ msgid Show tabs in the notes -#~ msgstr Lapok megjelenÃtése a jegyzeteken ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Add copyright notice to headers
Updating branch refs/heads/master to 29e052d12745196ba251b64bb5f699275ec5cb60 (commit) from 5964507a295a4c803066c758e94ead95b1509e73 (commit) commit 29e052d12745196ba251b64bb5f699275ec5cb60 Author: Stephan Arts step...@xfce.org Date: Wed Sep 23 23:37:40 2009 +0200 Add copyright notice to headers src/thumbnail.c |2 ++ src/thumbnail.h |2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/src/thumbnail.c b/src/thumbnail.c index 94f7abc..85eaabc 100644 --- a/src/thumbnail.c +++ b/src/thumbnail.c @@ -1,4 +1,6 @@ /* + * Copyright (C) Stephan Arts 2006-2009 step...@xfce.org + * * 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; either version 2 of the License, or diff --git a/src/thumbnail.h b/src/thumbnail.h index 1ca3014..9b1c054 100644 --- a/src/thumbnail.h +++ b/src/thumbnail.h @@ -1,4 +1,6 @@ /* + * Copyright (C) Stephan Arts 2006-2009 step...@xfce.org + * * 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; either version 2 of the License, or ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] ristretto:master Implement open-with menu with launcher menu-items
Updating branch refs/heads/master
to 5964507a295a4c803066c758e94ead95b1509e73 (commit)
from 5562dcd515df545490234466f9ab2c419de78868 (commit)
commit 5964507a295a4c803066c758e94ead95b1509e73
Author: Stephan Arts step...@xfce.org
Date: Wed Sep 23 23:36:47 2009 +0200
Implement open-with menu with launcher menu-items
ChangeLog |7 +++
src/Makefile.am |1 +
src/app_menu_item.c | 137 +++
src/app_menu_item.h | 66
src/main_window.c |8 +--
5 files changed, 214 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 77d4312..aab1ee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-23 Stephan Arts step...@xfce.org
+
+ * src/app_menu_item.c,
+ src/app_menu_item.h,
+ src/main_window.c,
+ src/Makefile.am: Implement open-with menu with launcher menu-items
+
2009-09-22 Stephan Arts step...@xfce.org
* src/main_window.c: Add initial code for implementation of the
diff --git a/src/Makefile.am b/src/Makefile.am
index c201e0f..9a88f24 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,7 @@ ristretto_SOURCES = \
preferences_dialog.h preferences_dialog.c \
main_window_ui.h \
main_window.c main_window.h \
+app_menu_item.c app_menu_item.h \
thumbnail_bar.c thumbnail_bar.h \
thumbnail.c thumbnail.h \
main.c
diff --git a/src/app_menu_item.c b/src/app_menu_item.c
new file mode 100644
index 000..5ef2f65
--- /dev/null
+++ b/src/app_menu_item.c
@@ -0,0 +1,137 @@
+/*
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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 Library 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include config.h
+#include gio/gio.h
+#include gtk/gtk.h
+#include string.h
+
+#include app_menu_item.h
+
+struct _RsttoAppMenuItemPriv
+{
+GAppInfo *app_info;
+GFile *file;
+};
+
+static GtkWidgetClass *parent_class = NULL;
+
+static void
+rstto_app_menu_item_init(RsttoAppMenuItem *);
+static void
+rstto_app_menu_item_class_init(RsttoAppMenuItemClass *);
+static void
+rstto_app_menu_item_finalize(GObject *object);
+
+static void
+rstto_app_menu_item_activate (GObject *object);
+
+GType
+rstto_app_menu_item_get_type (void)
+{
+static GType rstto_app_menu_item_type = 0;
+
+if (!rstto_app_menu_item_type)
+{
+static const GTypeInfo rstto_app_menu_item_info =
+{
+sizeof (RsttoAppMenuItemClass),
+(GBaseInitFunc) NULL,
+(GBaseFinalizeFunc) NULL,
+(GClassInitFunc) rstto_app_menu_item_class_init,
+(GClassFinalizeFunc) NULL,
+NULL,
+sizeof (RsttoAppMenuItem),
+0,
+(GInstanceInitFunc) rstto_app_menu_item_init,
+NULL
+};
+
+rstto_app_menu_item_type = g_type_register_static
(GTK_TYPE_IMAGE_MENU_ITEM, RsttoAppMenuItem, rstto_app_menu_item_info, 0);
+}
+return rstto_app_menu_item_type;
+}
+
+static void
+rstto_app_menu_item_init (RsttoAppMenuItem *menu_item)
+{
+menu_item-priv = g_new0 (RsttoAppMenuItemPriv, 1);
+}
+
+static void
+rstto_app_menu_item_class_init(RsttoAppMenuItemClass *app_menu_item_class)
+{
+GtkWidgetClass *widget_class;
+GtkMenuItemClass *menu_item_class;
+GObjectClass *object_class;
+
+object_class = (GObjectClass*)app_menu_item_class;
+menu_item_class = (GtkMenuItemClass*)app_menu_item_class;
+
+parent_class = g_type_class_peek_parent (app_menu_item_class);
+
+object_class-finalize = rstto_app_menu_item_finalize;
+menu_item_class-activate = rstto_app_menu_item_activate;
+}
+
+static void
+rstto_app_menu_item_finalize(GObject *object)
+{
+RsttoAppMenuItem *menu_item = RSTTO_APP_MENU_ITEM(object);
+if (menu_item-priv-app_info)
+{
+g_object_unref (menu_item-priv-app_info);
+menu_item-priv-app_info = NULL;
+}
+if (menu_item-priv-file)
+{
+g_object_unref (menu_item-priv-file);
+menu_item-priv-file = NULL;
+}
+
+}
+
+static void
+rstto_app_menu_item_activate (GObject *object)
+{
+RsttoAppMenuItem *app_menu_item = RSTTO_APP_MENU_ITEM(object);
+GList *files = g_list_append (NULL, app_menu_item-priv-file);
+
+g_app_info_launch (app_menu_item-priv-app_info, files, NULL, NULL);
+
+
[Xfce4-commits] xfce-utils:master fix gpg/ssh-agent startup for users with pam_ssh installed
Updating branch refs/heads/master to c67549e4b0648a95af9b1e5197cacdc452fea68b (commit) from 1631634f2427fe1797cbff67b771f5d5badd275b (commit) commit c67549e4b0648a95af9b1e5197cacdc452fea68b Author: Brian J. Tarricone br...@tarricone.org Date: Wed Sep 23 15:23:30 2009 -0700 fix gpg/ssh-agent startup for users with pam_ssh installed this also fixes the case where ssh-agent just happens to be already running. it's now a lot smarter about figuring out what to run, and to make sure it cleans up after itself properly. NEWS |1 + scripts/xinitrc.in.in | 55 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/NEWS b/NEWS index 2606a2d..14b28f4 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ 4.7.0 = +- Add support for starting gpg-agent. - Add ability to enable/disable or change the type of screensaver and ssh-agent using xfconf. diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in index e1a2167..fb3f6a3 100755 --- a/scripts/xinitrc.in.in +++ b/scripts/xinitrc.in.in @@ -140,29 +140,55 @@ fi # launch gpg-agent or ssh-agent if enabled. ssh_agent_enabled=`xfconf-query -c xfce4-session -p /startup/ssh-agent/enabled` -if test -z $SSH_AGENT_PID -a $ssh_agent_enabled != false; then +if test $ssh_agent_enabled != false; then +# if the user has pam_ssh installed, it will start ssh-agent for us, but +# of course won't start gpg-agent. so, if ssh-agent is already running, +# but we want gpg-agent (and that's not running yet) start gpg-agent +# without ssh support + ssh_agent_type=`xfconf-query -c xfce4-session -p /startup/ssh-agent/type` +if test -z $ssh_agent_type; then +if type gpg-agent /dev/null 21; then +ssh_agent_type=gpg-agent +else +ssh_agent_type=ssh-agent +fi +fi + +# ignore stale ssh-agents +if test $SSH_AGENT_PID; then +if ! kill -0 $SSH_AGENT_PID; then +unset SSH_AGENT_PID +unset SSH_AUTH_SOCK +fi +fi case $ssh_agent_type in gpg-agent) -eval `gpg-agent --daemon --enable-ssh-support` -ssh_agent_kill_cmd=kill -INT $SSH_AGENT_PID +if test -z $SSH_AGENT_PID; then +eval `gpg-agent --daemon --enable-ssh-support --write-env-file $XDG_CACHE_HOME/gpg-agent-info` +ssh_agent_kill_cmd=kill -INT $SSH_AGENT_PID; rm -f $XDG_CACHE_HOME/gpg-agent-info +elif test -z $GPG_AGENT_INFO; then +echo ssh-agent is already running; starting gpg-agent without ssh support +eval `gpg-agent --daemon --write-env-file $XDG_CACHE_HOME/gpg-agent-info` +ssh_agent_kill_cmd=pkill -INT ^gpg-agent\$; rm -f $XDG_CACHE_HOME/gpg-agent-info +else +echo gpg-agent is already running +fi ;; ssh-agent) -eval `ssh-agent -s` -ssh_agent_kill_cmd=ssh-agent -k -;; - -*) -if type gpg-agent /dev/null 21; then -eval `gpg-agent --daemon --enable-ssh-support` -ssh_agent_kill_cmd=kill -INT $SSH_AGENT_PID -elif type ssh-agent /dev/null 21; then +if test -z $SSH_AGENT_PID; then eval `ssh-agent -s` ssh_agent_kill_cmd=ssh-agent -k +else +echo ssh-agent is already running fi ;; + +*) +echo Unrecognized agent type '$ssh_agent_type' 2 +;; esac fi @@ -172,7 +198,8 @@ if type xfce4-session /dev/null 21; then xfce4-session if test $ssh_agent_kill_cmd; then -$ssh_agent_kill_cmd +echo running '$ssh_agent_kill_cmd' +eval $ssh_agent_kill_cmd fi exit 0 @@ -261,7 +288,7 @@ EOF esac if test $ssh_agent_kill_cmd; then - $ssh_agent_kill_cmd + eval $ssh_agent_kill_cmd fi xsetroot -bg white -fg red -solid black -cursor_name watch ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfburn:master Forgot to add message to NEWS
Updating branch refs/heads/master to 821906c50950701e01a3395925428ca407a518c5 (commit) from 2ae0462148a099c7e73777b8985c29b09fa6babc (commit) commit 821906c50950701e01a3395925428ca407a518c5 Author: David Mohr squis...@xfce.org Date: Sat Aug 22 22:53:38 2009 -0600 Forgot to add message to NEWS NEWS |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 1047f68..4237fe6 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,8 @@ xfburn 0.4.3 (2009-XX-XX) - +- Again show the volume name in the burn dialog if it has the default value + xfburn 0.4.2 (2009-07-23) - ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfburn:master Mark constructor properties, make some constructor_only
Updating branch refs/heads/master
to 78995b7eee0acde27bd0ea41137a7635174d362e (commit)
from 821906c50950701e01a3395925428ca407a518c5 (commit)
commit 78995b7eee0acde27bd0ea41137a7635174d362e
Author: David Mohr squis...@xfce.org
Date: Wed Sep 23 18:02:43 2009 -0600
Mark constructor properties, make some constructor_only
xfburn/xfburn-device-box.c | 40 ++--
xfburn/xfburn-device-list.c |1 +
2 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/xfburn/xfburn-device-box.c b/xfburn/xfburn-device-box.c
index f3d12bf..8b7d9f0 100644
--- a/xfburn/xfburn-device-box.c
+++ b/xfburn/xfburn-device-box.c
@@ -1,6 +1,7 @@
/* $Id$ */
/*
* Copyright (c) 2006 Jean-François Wauthy (pol...@xfce.org)
+ * Copyright (c) 2008-2009 David Mohr da...@mcbf.net
*
* 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
@@ -104,7 +105,7 @@ static void xfburn_device_box_finalize (GObject * object);
static void xfburn_device_box_get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec);
static void xfburn_device_box_set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec);
-static guint ask_for_blanking (XfburnDeviceBoxPrivate *priv);
+static gboolean ask_for_blanking (XfburnDeviceBoxPrivate *priv);
static void status_label_update (XfburnDeviceBoxPrivate *priv);
static gboolean check_disc_validity (XfburnDeviceBoxPrivate *priv);
static void refresh_drive_info (XfburnDeviceBox *box, XfburnDevice *device);
@@ -171,15 +172,16 @@ xfburn_device_box_class_init (XfburnDeviceBoxClass *
klass)
g_object_class_install_property (object_class, PROP_SHOW_WRITERS_ONLY,
g_param_spec_boolean (show-writers-only,
_(Show writers only),
-_(Show writers
only), FALSE, G_PARAM_READWRITE));
+_(Show writers only),
+FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class, PROP_SHOW_SPEED_SELECTION,
g_param_spec_boolean
(show-speed-selection, _(Show speed selection),
_(Show speed
selection combo),
-FALSE,
G_PARAM_READWRITE));
+FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class, PROP_SHOW_MODE_SELECTION,
g_param_spec_boolean
(show-mode-selection, _(Show mode selection),
_(Show mode selection
combo),
-FALSE,
G_PARAM_READWRITE));
+FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class, PROP_VALID,
g_param_spec_boolean (valid, _(Is it a
valid combination),
_(Is the combination
of hardware and disc valid to burn the composition?),
@@ -187,11 +189,11 @@ xfburn_device_box_class_init (XfburnDeviceBoxClass *
klass)
g_object_class_install_property (object_class, PROP_BLANK_MODE,
g_param_spec_boolean (blank-mode,
_(Blank mode),
_(The blank mode
shows different disc status messages than regular mode),
-FALSE,
G_PARAM_READWRITE));
+FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property (object_class, PROP_ACCEPT_ONLY_CD,
g_param_spec_boolean (accept-only-cd,
_(Accept only CDs as valid discs),
_(Accept only CDs as
valid discs),
-FALSE,
G_PARAM_READWRITE));
+FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
}
static GObject *
@@ -256,6 +258,10 @@ xfburn_device_box_constructor (GType type, guint
n_construct_properties, GObject
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv-combo_speed), cell,
text, SPEED_TEXT_COLUMN, NULL);
gtk_widget_show (priv-combo_speed);
gtk_box_pack_start (GTK_BOX (priv-hbox_speed_selection), priv-combo_speed,
TRUE, TRUE, BORDER);
+ if (priv-show_speed_selection) {
+gtk_widget_show (priv-hbox_speed_selection);
+fill_combo_speed (XFBURN_DEVICE_BOX (box),
[Xfce4-commits] xfce4-docs:master Make project configurable. Detect sphinx/python, simplify Makefiles.
Updating branch refs/heads/master to 9d103518acdb1ec0468ce72c714a9938870026c7 (commit) from 61b11867f99aba17fa6d72fa2d73145f75ee3f44 (commit) commit 9d103518acdb1ec0468ce72c714a9938870026c7 Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 24 03:05:41 2009 +0200 Make project configurable. Detect sphinx/python, simplify Makefiles. COPYING | 674 +++ INSTALL | 302 autogen.sh | 32 ++ configure.in.in | 111 ++ docs/Makefile.am|5 + docs/project-template/C/Makefile.am | 33 +-- 6 files changed, 1135 insertions(+), 22 deletions(-) diff --git a/COPYING b/COPYING new file mode 100644 index 000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ +GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. http://fsf.org/ + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + This License refers to version 3 of the GNU General Public License. + + Copyright also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + The Program refers to any copyrightable work licensed under this +License. Each licensee is addressed as you. Licensees and +recipients may be individuals or organizations. + +
[Xfce4-commits] xfce4-docs:master Add EXTRA_DIST for conf.py and the .rst files.
Updating branch refs/heads/master to 9d388bd7ca2a010f51dffe9f44ce4175375b250d (commit) from 9d103518acdb1ec0468ce72c714a9938870026c7 (commit) commit 9d388bd7ca2a010f51dffe9f44ce4175375b250d Author: Jannis Pohlmann jan...@xfce.org Date: Thu Sep 24 03:17:58 2009 +0200 Add EXTRA_DIST for conf.py and the .rst files. docs/project-template/C/Makefile.am |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/docs/project-template/C/Makefile.am b/docs/project-template/C/Makefile.am index 3ec8ca7..c8acfd8 100644 --- a/docs/project-template/C/Makefile.am +++ b/docs/project-template/C/Makefile.am @@ -1,3 +1,5 @@ +# vi:set ts=8 sw=8 noet ai nocindent syntax=automake: + project = project-template docsdir = $(datadir)/xfce4/docs/$(project) @@ -15,3 +17,7 @@ install: all uninstall: rm -rf $(docsdir) + +EXTRA_DIST = \ + conf.py \ + *.rst ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
