[Xfce4-commits] xfce4-panel:master Fix menu positioning with autohide panels.

[Nick Schermer]

Updating branch refs/heads/master
 to 7b9a047f9417140659df7dd35e864a5daaf1a9cb (commit)
   from bf74984f4b5605331a69cbedba9fb4aa8a5e5baa (commit)

commit 7b9a047f9417140659df7dd35e864a5daaf1a9cb
Author: Nick Schermer n...@xfce.org
Date:   Sun Jul 25 14:20:38 2010 +0200

Fix menu positioning with autohide panels.

 libxfce4panel/xfce-panel-plugin.c |   33 +
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/libxfce4panel/xfce-panel-plugin.c 
b/libxfce4panel/xfce-panel-plugin.c
index 8122620..b35379b 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -2022,6 +2022,7 @@ xfce_panel_plugin_position_widget (XfcePanelPlugin 
*plugin,
   GdkScreen  *screen;
   GdkRectanglemonitor;
   gintmonitor_num;
+  GTimeValnow_t, end_t;
 
   g_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin));
   g_return_if_fail (GTK_IS_WIDGET (menu_widget));
@@ -2044,7 +2045,31 @@ xfce_panel_plugin_position_widget (XfcePanelPlugin 
*plugin,
   gtk_widget_size_request (menu_widget, requisition);
 
   /* get the root position of the attach widget */
-  gdk_window_get_origin (GDK_WINDOW (attach_widget-window), x, y);
+  gdk_window_get_position (GDK_WINDOW (attach_widget-window), x, y);
+
+  /* if the panel is hidden (auto hide is enabled) and we requested a
+   * panel lock, wait for gtk to position the panel before we actually
+   * use the coordinates */
+  if (plugin-priv-panel_lock  0)
+{
+  g_get_current_time (end_t);
+  g_time_val_add (end_t, G_USEC_PER_SEC / 2);
+
+  while (*x == -  *y == -)
+{
+  while (gtk_events_pending ())
+gtk_main_iteration ();
+
+  gdk_window_get_position (GDK_WINDOW (attach_widget-window), x, y);
+
+  /* don't try longer then 1/2 a second */
+  g_get_current_time (now_t);
+  if (now_t.tv_sec  end_t.tv_sec
+  || (now_t.tv_sec == end_t.tv_sec
+   now_t.tv_usec  end_t.tv_usec))
+break;
+}
+}
 
   /* add the widgets allocation */
   *x += attach_widget-allocation.x;
@@ -2141,6 +2166,9 @@ xfce_panel_plugin_position_menu (GtkMenu  *menu,
   g_return_if_fail (GTK_IS_MENU (menu));
   g_return_if_fail (XFCE_PANEL_PLUGIN_CONSTRUCTED (panel_plugin));
 
+  /* register the menu */
+  xfce_panel_plugin_register_menu (XFCE_PANEL_PLUGIN (panel_plugin), menu);
+
   /* calculate the coordinates */
   attach_widget = gtk_menu_get_attach_widget (menu);
   xfce_panel_plugin_position_widget (XFCE_PANEL_PLUGIN (panel_plugin),
@@ -2148,9 +2176,6 @@ xfce_panel_plugin_position_menu (GtkMenu  *menu,
 
   /* keep the menu inside screen */
   *push_in = TRUE;
-
-  /* register the menu */
-  xfce_panel_plugin_register_menu (XFCE_PANEL_PLUGIN (panel_plugin), menu);
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:master Always wait for a grab if we popup menus from events.

[Nick Schermer]

Updating branch refs/heads/master
 to 62e842ad4fff5fa64d3ab224e3a8845a64133b44 (commit)
   from 7b9a047f9417140659df7dd35e864a5daaf1a9cb (commit)

commit 62e842ad4fff5fa64d3ab224e3a8845a64133b44
Author: Nick Schermer n...@xfce.org
Date:   Sun Jul 25 14:20:59 2010 +0200

Always wait for a grab if we popup menus from events.

 plugins/applicationsmenu/applicationsmenu.c |6 +++---
 plugins/directorymenu/directorymenu.c   |6 +++---
 plugins/windowmenu/windowmenu.c |6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/applicationsmenu/applicationsmenu.c 
b/plugins/applicationsmenu/applicationsmenu.c
index b501dbe..7720f56 100644
--- a/plugins/applicationsmenu/applicationsmenu.c
+++ b/plugins/applicationsmenu/applicationsmenu.c
@@ -559,15 +559,15 @@ applications_menu_plugin_remote_event (XfcePanelPlugin 
*panel_plugin,
 
   if (strcmp (name, popup) == 0
GTK_WIDGET_VISIBLE (panel_plugin)
-   !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin-button)))
+   !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin-button))
+   panel_utils_grab_available ())
 {
   if (value != NULL
G_VALUE_HOLDS_BOOLEAN (value)
g_value_get_boolean (value))
 {
   /* show menu under cursor */
-  if (panel_utils_grab_available ())
-applications_menu_plugin_menu (NULL, plugin);
+  applications_menu_plugin_menu (NULL, plugin);
 }
   else
 {
diff --git a/plugins/directorymenu/directorymenu.c 
b/plugins/directorymenu/directorymenu.c
index 0502d66..d8edb0c 100644
--- a/plugins/directorymenu/directorymenu.c
+++ b/plugins/directorymenu/directorymenu.c
@@ -455,15 +455,15 @@ directory_menu_plugin_remote_event (XfcePanelPlugin 
*panel_plugin,
 
   if (strcmp (name, popup) == 0
GTK_WIDGET_VISIBLE (panel_plugin)
-   !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin-button)))
+   !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin-button))
+   panel_utils_grab_available ())
 {
   if (value != NULL
G_VALUE_HOLDS_BOOLEAN (value)
g_value_get_boolean (value))
 {
   /* popup the menu under the pointer */
-  if (panel_utils_grab_available ())
-directory_menu_plugin_menu (NULL, plugin);
+  directory_menu_plugin_menu (NULL, plugin);
 }
   else
 {
diff --git a/plugins/windowmenu/windowmenu.c b/plugins/windowmenu/windowmenu.c
index 09a86cd..b6f9127 100644
--- a/plugins/windowmenu/windowmenu.c
+++ b/plugins/windowmenu/windowmenu.c
@@ -582,15 +582,15 @@ window_menu_plugin_remote_event (XfcePanelPlugin 
*panel_plugin,
 
   if (strcmp (name, popup) == 0
GTK_WIDGET_VISIBLE (panel_plugin)
-   !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin-button)))
+   !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (plugin-button))
+   panel_utils_grab_available ())
 {
   if (value != NULL
G_VALUE_HOLDS_BOOLEAN (value)
g_value_get_boolean (value))
 {
   /* popup the menu under the pointer */
-  if (panel_utils_grab_available ())
-window_menu_plugin_menu (NULL, plugin);
+  window_menu_plugin_menu (NULL, plugin);
 }
   else
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:master Register the plugin menu to block autohide.

[Nick Schermer]

Updating branch refs/heads/master
 to 90d8774fd1152f7c14163aef29a8d16de4b6a8b3 (commit)
   from 3ef0c0c04c609d9ca55279a7b74a96a848ed710c (commit)

commit 90d8774fd1152f7c14163aef29a8d16de4b6a8b3
Author: Nick Schermer n...@xfce.org
Date:   Sun Jul 25 15:30:46 2010 +0200

Register the plugin menu to block autohide.

 libxfce4panel/xfce-panel-plugin.c |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/libxfce4panel/xfce-panel-plugin.c 
b/libxfce4panel/xfce-panel-plugin.c
index b35379b..1728a49 100644
--- a/libxfce4panel/xfce-panel-plugin.c
+++ b/libxfce4panel/xfce-panel-plugin.c
@@ -1138,6 +1138,9 @@ xfce_panel_plugin_menu_get (XfcePanelPlugin *plugin)
   plugin-priv-menu = GTK_MENU (menu);
 }
 
+  /* block autohide when this menu is shown */
+  xfce_panel_plugin_register_menu (plugin, GTK_MENU (plugin-priv-menu));
+
   return plugin-priv-menu;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:master Don't handle grabs on the window from menu's.

[Nick Schermer]

Updating branch refs/heads/master
 to 3ef0c0c04c609d9ca55279a7b74a96a848ed710c (commit)
   from 62e842ad4fff5fa64d3ab224e3a8845a64133b44 (commit)

commit 3ef0c0c04c609d9ca55279a7b74a96a848ed710c
Author: Nick Schermer n...@xfce.org
Date:   Sun Jul 25 15:27:17 2010 +0200

Don't handle grabs on the window from menu's.

 panel/panel-window.c |   34 ++
 1 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/panel/panel-window.c b/panel/panel-window.c
index fda3a23..28b5ef7 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -95,7 +95,7 @@ static gboolean panel_window_button_press_event 
(GtkWidget*w
 static gboolean panel_window_button_release_event   (GtkWidget
*widget,
  GdkEventButton   
*event);
 static void panel_window_grab_notify(GtkWidget
*widget,
- gboolean 
was_grabbed);
+ gboolean  
was_grabbed);
 static void panel_window_size_request   (GtkWidget
*widget,
  GtkRequisition   
*requisition);
 static void panel_window_size_allocate  (GtkWidget
*widget,
@@ -264,6 +264,7 @@ struct _PanelWindow
   AutohideStateautohide_state;
   guintautohide_timeout_id;
   gint autohide_block;
+  gint autohide_grab_block;
 
   /* popup/down delay from gtk style */
   gint popup_delay;
@@ -430,6 +431,7 @@ panel_window_init (PanelWindow *window)
   window-autohide_state = AUTOHIDE_DISABLED;
   window-autohide_timeout_id = 0;
   window-autohide_block = 0;
+  window-autohide_grab_block = 0;
   window-popup_delay = DEFAULT_POPUP_DELAY;
   window-popdown_delay = DEFAULT_POPDOWN_DELAY;
   window-base_x = -1;
@@ -1005,14 +1007,30 @@ panel_window_grab_notify (GtkWidget *widget,
   gboolean   was_grabbed)
 {
   PanelWindow *window = PANEL_WINDOW (widget);
+  GtkWidget   *current;
 
-  /* avoid hiding the panel when the window is grabbed. this
-   * (for example) happens when the user drags in the pager plugin
-   * see bug #4597 */
-  if (was_grabbed)
-panel_window_thaw_autohide (window);
-  else
-panel_window_freeze_autohide (window);
+  current = gtk_grab_get_current ();
+  if (GTK_IS_MENU_SHELL (current))
+{
+  /* don't act on menu grabs, they should be registered through the
+   * plugin if they should block autohide */
+  window-autohide_grab_block++;
+}
+  else if (window-autohide_grab_block  0)
+{
+  /* drop previous menu block */
+  window-autohide_grab_block--;
+}
+  else if (window-autohide_grab_block == 0)
+{
+  /* avoid hiding the panel when the window is grabbed. this
+   * (for example) happens when the user drags in the pager plugin
+   * see bug #4597 */
+  if (was_grabbed)
+panel_window_thaw_autohide (window);
+  else
+panel_window_freeze_autohide (window);
+}
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add support for iPods with ID_MEDIA_PLAYER unset.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 224e7bf94f9b20e1b5005c9b9d1647c42b746800 (commit)
   from 874edb2002a2ab824441f8c838a239961b6d713d (commit)

commit 224e7bf94f9b20e1b5005c9b9d1647c42b746800
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sun Jul 25 18:19:29 2010 +0200

Add support for iPods with ID_MEDIA_PLAYER unset.

 thunar-volman/tvm-block-device.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 77fd287..f29608c 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -201,7 +201,7 @@ tvm_block_device_autoipod (TvmContext *context,
   if (path_dcim != NULL)
 {
   /* ...so we need to prompt what to do */
-  response = tvm_prompt (context, gnome-dev-ipod, _(Photos and 
Music),
+  response = tvm_prompt (context, multimedia-player, _(Photos and 
Music),
  _(Photos were found on your portable music 
player),
  _(Would you like to import the photos or 
manage the 
music?),
@@ -210,7 +210,7 @@ tvm_block_device_autoipod (TvmContext *context,
  _(Manage _Music), TVM_RESPONSE_MUSIC,
  NULL);
 }
-  else if (is_audio_player)
+  else if (is_audio_player || is_ipod)
 {
   response = TVM_RESPONSE_MUSIC;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] libxfce4util:master Post release tag bump.

[Nick Schermer]

Updating branch refs/heads/master
 to 39d106d0e83590f39d62a01e684b5602e3742815 (commit)
   from 9672d22c845d95f583aa97fe6c3488d8fb91eada (commit)

commit 39d106d0e83590f39d62a01e684b5602e3742815
Author: Nick Schermer n...@xfce.org
Date:   Sun Jul 25 18:37:09 2010 +0200

Post release tag bump.

 configure.in.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index a469e5e..cac4e0d 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -16,7 +16,7 @@ m4_define([libxfce4util_version_minor], [7])
 m4_define([libxfce4util_version_micro], [2])
 m4_define([libxfce4util_version_nano], [])   dnl leave this empty to have no 
nano version
 m4_define([libxfce4util_version_build], [...@revision@])
-m4_define([libxfce4util_version_tag], [])
+m4_define([libxfce4util_version_tag], [git])
 m4_define([libxfce4util_version], 
[libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(),
 [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), 
[git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])])
 
 dnl **
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] libxfce4util:master Updates for release.

[Nick Schermer]

Updating branch refs/heads/master
 to 9672d22c845d95f583aa97fe6c3488d8fb91eada (commit)
   from 8b51c809415f552f4c63a6427d69ed7bb6baa5a9 (commit)

commit 9672d22c845d95f583aa97fe6c3488d8fb91eada
Author: Nick Schermer n...@xfce.org
Date:   Sun Jul 25 18:35:22 2010 +0200

Updates for release.

 NEWS|9 +
 configure.in.in |4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index fd60234..d452cbd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+4.7.2
+=
+- Optimize xfce_rc_read_bool_entry().
+- Optimize strcmp in xfce-rc-simple.
+- Fix broken translations in applications using libxfce4util (bug #5842).
+- Deprecate XfceDesktopEntry.
+- Translation updates (ru, cs, lv, fi, eu, de, bn, de, uk, si, kk,
+  pa, gl, zh_TW, sk, ug, fr, id, it).
+
 4.7.1
 =
 - Remove po/LINGUAS file so it does not override the languages defined
diff --git a/configure.in.in b/configure.in.in
index 9e96e2d..a469e5e 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -13,10 +13,10 @@ dnl ***
 m4_define([libxfce4util_verinfo], [5:1:1])
 m4_define([libxfce4util_version_major], [4])
 m4_define([libxfce4util_version_minor], [7])
-m4_define([libxfce4util_version_micro], [1])
+m4_define([libxfce4util_version_micro], [2])
 m4_define([libxfce4util_version_nano], [])   dnl leave this empty to have no 
nano version
 m4_define([libxfce4util_version_build], [...@revision@])
-m4_define([libxfce4util_version_tag], [git])
+m4_define([libxfce4util_version_tag], [])
 m4_define([libxfce4util_version], 
[libxfce4util_version_major().libxfce4util_version_minor().libxfce4util_version_micro()ifelse(libxfce4util_version_nano(),
 [], [], [.libxfce4util_version_nano()])ifelse(libxfce4util_version_tag(), 
[git], [libxfce4util_version_tag()-libxfce4util_version_build()], [])])
 
 dnl **
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] libxfce4util|libxfce4util-4.7.2 Creating annotated tag libxfce4util-4.7.2

[Nick Schermer]

Updating annotated tag refs/tags/libxfce4util-4.7.2
 as new annotated tag
 to 8169732f6509d5c1108fd4eaae4063a7c6764992 (tag)
   succeeds libxfce4util-4.7.1
  tagged by Nick Schermer n...@xfce.org
 on 2010-07-25 16:36 +

A S  Alam (1):
  l10n: Updated Panjabi (Punjabi) (pa) translation to 57%

Aleksandr Ponomarenko (1):
  l10n: Updated Russian (ru) translation to 100%

Andhika Padmawan (1):
  l10n: Updated Indonesian (id) translation to 100%

Bauzhan Muftakhidinov (1):
  l10n: Updated Kazakh (kk) translation to 100%

Cheng-Chia Tseng (1):
  l10n: Updates to Traditional Chinese translation

Cristian Marchi (1):
  l10n: New Italian translation file

Danishka Navin (1):
  l10n: Updated Sinhala (si) translation to 71%

Dmitrij Smirnov (1):
  l10n: Updates to Russian (ru) translation

Dmitry Nikitin (1):
  l10n: Updated Ukrainian (uk) translation to 100%

Gheyret Kenji (1):
  l10n: Uyghur translation

Jamil Ahmed (2):
  l10n: Adding Bengali translation.
  l10n: Updated Bengali (bn) translation to 100%

Jari Rahkonen (1):
  l10n: Updated Finnish (fi) translation to 100%

Leandro Regueiro (1):
  l10n: Updated Galician (gl) translation to 100%

Maximilian Schleiss (1):
  l10n: Updated French (fr) translation to 100%

Michal Várady (1):
  l10n: Updated Czech (cs) translation to 100%

Nick Schermer (8):
  Post release tag bump.
  Optimize xfce_rc_read_bool_entry().
  Optimize strcmp in xfce-rc-simple.
  Fix broken translations in applications using libxfce4util.
  Deprecate XfceDesktopEntry.
  Fix build with deprecation and document it.
  Optimize strcmp in xfce-rc-simple a bit more.
  Updates for release.

Paul Seyfert (1):
  l10n: Updated German (de) translation to 85%

Piarres Beobide (1):
  l10n: Updated Basque (eu) translation to 57%

Rihards Prieditis (1):
  l10n: Updated Latvian (lv) translation to 100%

Robert Hartl (1):
  l10n: Updated Slovak (sk) translation to 71%

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Detect all devices as iPods whose ID_MODEL is prefixed with iPod.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to a8438d528e771e7703bd738ada21cf92e1cf8a91 (commit)
   from 224e7bf94f9b20e1b5005c9b9d1647c42b746800 (commit)

commit a8438d528e771e7703bd738ada21cf92e1cf8a91
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sun Jul 25 18:41:49 2010 +0200

Detect all devices as iPods whose ID_MODEL is prefixed with iPod.

 thunar-volman/tvm-block-device.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index f29608c..b7b8402 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -162,8 +162,8 @@ tvm_block_device_autoipod (TvmContext *context,
 ID_MEDIA_PLAYER);
 
   /* check if we have an iPod */
-  is_ipod = g_strcmp0 (g_udev_device_get_property (context-device, 
-   ID_MODEL), iPod) == 
0;
+  is_ipod = g_str_has_prefix (g_udev_device_get_property (context-device, 
+  ID_MODEL), 
iPod);
   if (is_ipod)
 {
   /* determine the mount point path */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] exo:master Updates for release.

[Nick Schermer]

Updating branch refs/heads/master
 to 1bfe7706a2f2de5c4d1f03f70f6979141001b6df (commit)
   from aef82478af40ebf3fd6a3f3bd73a7629682f0e7c (commit)

commit 1bfe7706a2f2de5c4d1f03f70f6979141001b6df
Author: Nick Schermer n...@xfce.org
Date:   Sun Jul 25 18:47:16 2010 +0200

Updates for release.

 NEWS|   13 +
 configure.in.in |4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index b418ed1..4a20b7c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+0.5.3
+=
+- Drop all HAL related code. Exo-hal is not used by thunar-volman
+  anymore now it is ported to udev, udisks is a non-hal replacement
+  for exo-mount.
+- Add working directory support to exo-desktop-item-edit (bug #5692).
+- Generate documentation with --enable-gen-doc.
+- Make the treeview work again with gtk 2.20 (bug #6230).
+- Fix compilation error (bug #6421).
+- Some compiler warnings and identation fixes.
+- Translation updates (de, ru, kk, si, zh_CN, es, hr, eu, bn, pa,
+  is, gl, el, tr, ug, fr, id, it, pt, pr_BR, da).
+
 0.5.2
 =
 - Some fixes in the python bindings (bug #6186, #6187 and #6188).
diff --git a/configure.in.in b/configure.in.in
index 7a7c248..9762040 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -12,10 +12,10 @@ m4_define([libexo_verinfo], [0:0:0])
 m4_define([libexo_version_api], [1])
 m4_define([libexo_version_major], [0])
 m4_define([libexo_version_minor], [5])
-m4_define([libexo_version_micro], [2])
+m4_define([libexo_version_micro], [3])
 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 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] exo:master Post release tag bump.

[Nick Schermer]

Updating branch refs/heads/master
 to a14334fa1b405b5b988401cf0bff818b1b0f3822 (commit)
   from 1bfe7706a2f2de5c4d1f03f70f6979141001b6df (commit)

commit a14334fa1b405b5b988401cf0bff818b1b0f3822
Author: Nick Schermer n...@xfce.org
Date:   Sun Jul 25 18:51:32 2010 +0200

Post release tag bump.

 configure.in.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 9762040..7d70a1b 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -15,7 +15,7 @@ m4_define([libexo_version_minor], [5])
 m4_define([libexo_version_micro], [3])
 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 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] exo|exo-0.5.3 Creating annotated tag exo-0.5.3

[Nick Schermer]

Updating annotated tag refs/tags/exo-0.5.3
 as new annotated tag
 to b6255ec2c724aa028e5bd6aa3d30bdf9c87b8229 (tag)
   succeeds exo-0.5.2
  tagged by Nick Schermer n...@xfce.org
 on 2010-07-25 16:51 +

A S  Alam (1):
  l10n: Updated Panjabi (Punjabi) (pa) translation to 97%

Abel Martín (3):
  l10n: Updated Spanish (Castilian) (es) translation to 100%
  l10n: Updated Spanish (Castilian) (es) translation to 91%
  l10n: Updated Spanish (Castilian) (es) translation to 100%

Andhika Padmawan (2):
  l10n: Updated Indonesian (id) translation to 100%
  l10n: Updated Indonesian (id) translation to 100%

Ayhan YALÇINSOY (1):
  l10n: Updated Turkish (tr) translation to 100%

Bauzhan Muftakhidinov (8):
  l10n: Updated Kazakh (kk) translation to 55%
  l10n: Updated Kazakh (kk) translation to 64%
  l10n: Updated Kazakh (kk) translation to 66%
  l10n: Updated Kazakh (kk) translation to 68%
  l10n: Updated Kazakh (kk) translation to 100%
  l10n: Updated Kazakh (kk) translation to 100%
  l10n: Updated Kazakh (kk) translation to 100%
  l10n: Updated Kazakh (kk) translation to 100%

Carles Muñoz Gorriz (1):
  l10n: Updated Catalan (Valencian) (ca) translation to 100%

Christian Persch (1):
  Add support to cache the gio module (bug #6337).

Christoph Wickert (2):
  l10n: Initial version by Matthias Mailänder
  l10n: Updated German (de) translation to 80%

Cristian Marchi (1):
  l10n: Updated Italian (it) translation to 100%

Danishka Navin (1):
  l10n: Added Sinhala (si) translation

Denis Koryavov (5):
  l10n: Updated Russian (ru) translation to 82%
  l10n: Updated Russian (ru) translation to 87%
  l10n: Updated Russian (ru) translation to 93%
  l10n: Updated Russian (ru) translation to 95%
  l10n: Updated Russian (ru) translation to 100%

Dmitrij Smirnov (1):
  l10n: Updated Russian (ru) translation to 78%

Evaggelos Balaskas (1):
  l10n: Updated Greek (el) translation to 100%

Gabor Kelemen (1):
  l10n: Updated Hungarian (hu) translation to 100%

Gheyret Kenji (2):
  l10n: Uyghur translation
  l10n: Uyghur translation

Harald Servat (1):
  l10n: Updated Catalan (Valencian) (ca) translation to 100%

Ivica  Kolić (2):
  l10n: Updated Croatian (hr) translation to 42%
  l10n: Updated Croatian (hr) translation to 52%

Jamil Ahmed (2):
  l10n: Updated Bengali (bn) translation to 100%
  l10n: Updated Bengali (bn) translation to 100%

Jannis Pohlmann (1):
  Include exo_mount_device_is_mount_point only when HAL is available.

Krasimir Chonov (1):
  l10n: Актуализиран превод

Leandro Regueiro (1):
  l10n: Updated Galician (gl) translation to 96%

Maximilian Schleiss (1):
  l10n: Updated French (fr) translation to 100%

Michael Martins (1):
  l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%

Nick Schermer (15):
  Post release tag bump.
  Fix some indentation.
  Only build the query function for glib 2.24 (bug #6366).
  Fix compilation error (bug #6421).
  Fix compiler warning.
  Make the treeview work again with gtk 2.20 (bug #6230).
  Generate documentation with --enable-gen-doc.
  Rebuild the documentation translations.
  Fix compiler warnings.
  Move documentation translations to a more suitable place.
  Add working directory support to exo-desktop-item-edit (bug #5692).
  Drop hal-related code.
  Rebuild translations.
  Fix distcheck.
  Updates for release.

Paul Seyfert (2):
  l10n: Updated German (de) translation to 93%
  l10n: Updated German (de) translation to 93%

Per Kongstad (1):
  l10n: Updated Danish (da) translation to 100%

Petar Koretić (5):
  l10n: New Croatian translation
  l10n: Updated Croatian (hr) translation to 4%
  l10n: Updated Croatian (hr) translation to 27%
  l10n: Updated Croatian (hr) translation to 28%
  l10n: Updated Croatian (hr) translation to 28%

Piarres Beobide (1):
  l10n: Updated Basque (eu) translation to 100%

Prabath Galagamage (1):
  l10n: Updated Sinhala (si) translation to 7%

Sergio Marques (1):
  l10n: Updated Portuguese (pt) translation to 100%

Stefan Stuhr (1):
  Fix typo in commit 5a2b111.

Sveinn í Felli (1):
  l10n: fyrsta prófun/first test

Xu Meihong (1):
  l10n: Updated Chinese (China) (zh_CN) translation to 100%

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] exo:jannis/validate-hal-udis Deleting branch jannis/validate-hal-udis

[well, not really]

Deleting branch refs/heads/jannis/validate-hal-udis

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:jannis/port-to-udev Deleting branch jannis/port-to-udev

[well, not really]

Deleting branch refs/heads/jannis/port-to-udev

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:jannis/port-to-udev Use GUDev and sysfs paths to spawn thunar-volman on udev events.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to ce5c871fdf28b33f393a2ff26eacb4148372dbee (commit)
   from 00db7f70831a33db9490a961f8043b4f78210ee8 (commit)

commit ce5c871fdf28b33f393a2ff26eacb4148372dbee
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sun Jan 17 03:11:05 2010 +0100

Use GUDev and sysfs paths to spawn thunar-volman on udev events.

 configure.in.in |   33 +++
 thunar/Makefile.am  |7 ++-
 thunar/thunar-application.c |  137 ---
 3 files changed, 104 insertions(+), 73 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 5e6ff69..6892334 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -171,6 +171,12 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBSTARTUP_NOTIFICATION],
[0.4], [startup-notification],
[startup notification library])
 
+dnl ***
+dnl *** Optional support for GUDev (required for thunar-volman) ***
+dnl ***
+XDT_CHECK_OPTIONAL_PACKAGE([GUDEV], [gudev-1.0], [145], [gudev], 
+   [GUDev (required for thunar-volman)])
+
 dnl *
 dnl *** Check for gtk-doc ***
 dnl *
@@ -292,19 +298,24 @@ echo
 echo Build Configuration:
 echo
 if test x$DBUS_FOUND = xyes; then
-echo * D-BUS support: yes
+echo * D-BUS support:  yes
 else
-echo * D-BUS support: no
+echo * D-BUS support:  no
 fi
 if test x$GIO_UNIX_FOUND = xyes; then
-echo * GIO UNIX features: yes
+echo * GIO UNIX features:  yes
 else
-echo * GIO UNIX features: no
+echo * GIO UNIX features:  no
 fi
 if test x$LIBSTARTUP_NOTIFICATION_FOUND = xyes; then
-echo * Startup Notification:  yes
+echo * Startup Notification:   yes
+else
+echo * Startup Notification:   no
+fi
+if test x$GUDEV_FOUND = xyes; then
+echo * GUDev (required for thunar-volman): yes
 else
-echo * Startup Notification:  no
+echo * GUDev (required for thunar-volman): no
 fi
 echo * Debug Support: $enable_debug
 if test x$enable_gen_doc = xyes; then
@@ -317,9 +328,9 @@ fi
 echo
 echo Additional Plugins:
 echo
-echo * Advanced Properties:   $ac_bm_thunar_plugin_apr
-echo * Simple Builting Renamers:  $ac_bm_thunar_plugin_sbr
-echo * Trash Panel Applet:$ac_bm_thunar_plugin_tpa
-echo * User Customizable Actions: $ac_bm_thunar_plugin_uca
-echo * Wallpaper support: $ac_bm_thunar_plugin_wallpaper
+echo * Advanced Properties:$ac_bm_thunar_plugin_apr
+echo * Simple Builting Renamers:   $ac_bm_thunar_plugin_sbr
+echo * Trash Panel Applet: $ac_bm_thunar_plugin_tpa
+echo * User Customizable Actions:  $ac_bm_thunar_plugin_uca
+echo * Wallpaper support:  $ac_bm_thunar_plugin_wallpaper
 echo
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 6c5b20c..436933d 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -12,6 +12,7 @@ INCLUDES =
\
-DPACKAGE_LOCALE_DIR=\$(localedir)\   \
-DTHUNAR_VERSION_API=\$(THUNAR_VERSION_API)\  \
-DSN_API_NOT_YET_FROZEN \
+   -DG_UDEV_API_IS_SUBJECT_TO_CHANGE   \
$(PLATFORM_CPPFLAGS)
 
 bin_SCRIPTS =  \
@@ -219,8 +220,9 @@ Thunar_SOURCES =
\
 
 Thunar_CFLAGS =
\
$(EXO_CFLAGS)   \
-   $(GTHREAD_CFLAGS)   \
$(GIO_CFLAGS)   \
+   $(GTHREAD_CFLAGS)   \
+   $(GUDEV_CFLAGS) \
$(LIBSM_CFLAGS) \
$(LIBSTARTUP_NOTIFICATION_CFLAGS)   \
$(LIBXFCE4UI_CFLAGS)\
@@ -235,8 +237,9 @@ Thunar_LDADD =  
\
$(top_builddir)/tdb/libtdb.la   \
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la\
$(EXO_LIBS) \
-   $(GTHREAD_LIBS) \
$(GIO_LIBS) \
+   $(GTHREAD_LIBS) \
+   $(GUDEV_LIBS)   

[Xfce4-commits] thunar:jannis/port-to-udev Don't react to udev change events for now. They are a little weird.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 900c9e68d3b3325df6671df9858e70775fa62d0a (commit)
   from 877f0d2125336f041c6d618ae00a8974ff08baab (commit)

commit 900c9e68d3b3325df6671df9858e70775fa62d0a
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 16:15:48 2010 +0200

Don't react to udev change events for now. They are a little weird.

 thunar/thunar-application.c |   10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 32b6a83..c885af6 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -493,9 +493,13 @@ thunar_application_uevent (GUdevClient   *client,
   /* determine the sysfs path of the device */
   sysfs_path = g_udev_device_get_sysfs_path (device);
 
-  /* distinguish between add and remove actions, ignore change and 
move */
-  if (g_strcmp0 (action, add) == 0 || g_strcmp0 (action, change) == 0)
+  /* distinguish between add, change and remove actions, ignore change 
and move */
+  if (g_strcmp0 (action, add) == 0) /* || g_strcmp0 (action, change) == 0) 
*/
 {
+#if 0
+  g_debug (path = %s, action = %s, sysfs_path, action);
+#endif
+
   /* only insert the path if we don't have it already */
   if (g_slist_find_custom (application-volman_udis, sysfs_path, 
(GCompareFunc) g_utf8_collate) == NULL)
@@ -559,6 +563,8 @@ thunar_application_volman_idle (gpointer user_data)
   argv[2] = application-volman_udis-data;
   argv[3] = NULL;
 
+  g_debug (  %s, g_strjoinv ( , argv));
+
   /* remove the first list item from the pending list */
   application-volman_udis = g_slist_delete_link 
(application-volman_udis, application-volman_udis);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:jannis/port-to-udev Also react on undev change events.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 877f0d2125336f041c6d618ae00a8974ff08baab (commit)
   from ce5c871fdf28b33f393a2ff26eacb4148372dbee (commit)

commit 877f0d2125336f041c6d618ae00a8974ff08baab
Author: Jannis Pohlmann jan...@xfce.org
Date:   Thu Jan 28 19:56:19 2010 +0100

Also react on undev change events.

 thunar/thunar-application.c |   71 +--
 1 files changed, 1 insertions(+), 70 deletions(-)

diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index b3709bc..32b6a83 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -103,11 +103,6 @@ static void   thunar_application_uevent
 (GUdevClient
  const gchar   
 *action,
  GUdevDevice   
 *device,
  
ThunarApplication  *application);
-#if 0
-static void   thunar_application_drive_eject
(GVolumeMonitor *volume_monitor,
- GDrive
 *drive,
- 
ThunarApplication  *application);
-#endif
 static gboolean   thunar_application_volman_idle(gpointer  
  user_data);
 static void   thunar_application_volman_idle_destroy(gpointer  
  user_data);
 static void   thunar_application_volman_watch   (GPid  
  pid,
@@ -220,14 +215,6 @@ thunar_application_init (ThunarApplication *application)
 }
 
 #ifdef HAVE_GUDEV
-#if 0
-  /* connect to the volume manager */
-  application-volume_monitor = g_volume_monitor_get ();
-
-  /* connect the volume manager support callbacks (used to spawn thunar-volman 
appropriately) */
-  g_signal_connect (application-volume_monitor, drive-eject-button, 
G_CALLBACK (thunar_application_drive_eject), application);
-#endif
-
   /* establish connection with udev */
   application-udev_client = g_udev_client_new (subsystems);
 
@@ -272,11 +259,6 @@ thunar_application_finalize (GObject *object)
   g_slist_foreach (application-volman_udis, (GFunc) g_free, NULL);
   g_slist_free (application-volman_udis);
 
-#if 0
-  /* disconnect from the volume monitor */
-  g_object_unref (application-volume_monitor);
-#endif
-
   /* disconnect from the udev client */
   g_object_unref (application-udev_client);
 #endif
@@ -512,7 +494,7 @@ thunar_application_uevent (GUdevClient   *client,
   sysfs_path = g_udev_device_get_sysfs_path (device);
 
   /* distinguish between add and remove actions, ignore change and 
move */
-  if (g_strcmp0 (action, add) == 0)
+  if (g_strcmp0 (action, add) == 0 || g_strcmp0 (action, change) == 0)
 {
   /* only insert the path if we don't have it already */
   if (g_slist_find_custom (application-volman_udis, sysfs_path, 
@@ -551,57 +533,6 @@ thunar_application_uevent (GUdevClient   *client,
 
 
 
-#if 0
-static void
-thunar_application_drive_eject (GVolumeMonitor*volume_monitor,
-GDrive*drive,
-ThunarApplication *application)
-{
-  GdkScreen *screen;
-  GError*err = NULL;
-  gchar *argv[4];
-  gchar *udi;
-
-  _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
-  _thunar_return_if_fail (application-volume_monitor == volume_monitor);
-  _thunar_return_if_fail (G_IS_DRIVE (drive));
-  _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
-
-  /* determine the HAL UDI for this device */
-  udi = g_drive_get_identifier (drive, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
-
-  /* check if we have a UDI */
-  if (G_LIKELY (udi != NULL))
-{
-  /* generate the argument list for exo-eject */
-  argv[0] = (gchar *) exo-eject;
-  argv[1] = (gchar *) -h;
-  argv[2] = (gchar *) udi;
-  argv[3] = NULL;
-
-  /* locate the currently active screen (the one with the pointer) */
-  screen = xfce_gdk_screen_get_active (NULL);
-
-  /* try to spawn the volume_monitor on the active screen */
-  if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, G_SPAWN_SEARCH_PATH, 
NULL, NULL, NULL, err))
-{
-  /* failed to launch exo-eject, inform the user about this */
-  thunar_dialogs_show_error (screen, err, _(Failed to execute 
\%s\), exo-eject);
-  g_error_free (err);
-}
-  else
-{
-  /* we most probably removed the device */
-  thunar_application_drive_disconnected (volume_monitor, drive, 
application);
-}
-
-  g_free (udi);
-}
-}
-#endif
-
-
-
 static gboolean
 thunar_application_volman_idle (gpointer user_data)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org

[Xfce4-commits] thunar:jannis/port-to-udev Copy exo-mount-notify-1 over to thunar (as thunar-mount-notify-1).

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 56bb0025b40cea452511d2c14c1f6eff893b4c91 (commit)
   from 7c5ae37a16eac3f16925ce6e043e41eb498c357e (commit)

commit 56bb0025b40cea452511d2c14c1f6eff893b4c91
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 18:21:11 2010 +0200

Copy exo-mount-notify-1 over to thunar (as thunar-mount-notify-1).

Now all we need to do is integrate it into Thunar and thunar-volman.

 Makefile.am |   26 -
 configure.in.in |   20 +++-
 thunar-mount-notify/Makefile.am |   46 +++
 thunar-mount-notify/main.c  |  269 +++
 4 files changed, 354 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dce959c..64a54ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,25 @@
-# $Id$
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+# -
+# Copyright (c) 2010 Jannis Pohlmann jan...@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 (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 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.
+
+if HAVE_LIBNOTIFY
+THUNAR_MOUNT_NOTIFY_SUBDIR=thunar-mount-notify
+endif
 
 SUBDIRS =  \
icons   \
@@ -8,6 +29,7 @@ SUBDIRS =  
\
tdb \
thunarx \
thunar  \
+   $(THUNAR_MOUNT_NOTIFY_SUBDIR)   \
docs\
examples\
plugins
@@ -95,5 +117,3 @@ DISTCLEANFILES = 
\
 DISTCHECK_CONFIGURE_FLAGS =\
--enable-gtk-doc\
--enable-gen-doc
-
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/configure.in.in b/configure.in.in
index 6892334..f7ae8d6 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -177,6 +177,12 @@ dnl 
***
 XDT_CHECK_OPTIONAL_PACKAGE([GUDEV], [gudev-1.0], [145], [gudev], 
[GUDev (required for thunar-volman)])
 
+dnl **
+dnl *** Optional support for libnotify ***
+dnl **
+XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.4.0], [notifications],
+   [Mount notification support], [yes])
+
 dnl *
 dnl *** Check for gtk-doc ***
 dnl *
@@ -289,6 +295,7 @@ thunar/Makefile
 thunarx/Makefile
 thunarx/thunarx-2.pc
 thunarx/thunarx-config.h
+thunar-mount-notify/Makefile
 ])
 
 dnl ***
@@ -317,13 +324,18 @@ echo * GUDev (required for thunar-volman): yes
 else
 echo * GUDev (required for thunar-volman): no
 fi
-echo * Debug Support: $enable_debug
+if test x$LIBNOTIFY_FOUND = xyes; then
+echo * Mount notification support: yes
+else
+echo * Mount notification support: no
+fi
+echo * Debug Support:  $enable_debug
 if test x$enable_gen_doc = xyes; then
-echo * Documentation: yes (generate)
+echo * Documentation:  yes (generate)
 elif test -d ${srcdir}/docs/manual/html; then
-echo * Documentation: yes (in tarball)
+echo * Documentation:  yes (in tarball)
 else
-echo * Documentation: no
+echo * Documentation:  no
 fi
 echo
 echo Additional Plugins:
diff --git a/thunar-mount-notify/Makefile.am b/thunar-mount-notify/Makefile.am
new file mode 100644
index 000..1e72f22
--- /dev/null
+++ b/thunar-mount-notify/Makefile.am
@@ -0,0 +1,46 @@
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+# -
+# Copyright (c) 2010 Jannis Pohlmann jan...@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 

[Xfce4-commits] thunar:jannis/port-to-udev React on change events of CD drives if they have media available.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 7c5ae37a16eac3f16925ce6e043e41eb498c357e (commit)
   from 900c9e68d3b3325df6671df9858e70775fa62d0a (commit)

commit 7c5ae37a16eac3f16925ce6e043e41eb498c357e
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 12:36:09 2010 +0200

React on change events of CD drives if they have media available.

 thunar/thunar-application.c |   13 ++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index c885af6..0b2e8d6 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -2,7 +2,7 @@
 /*-
  * Copyright (c) 2005-2007 Benedikt Meurer be...@xfce.org
  * Copyright (c) 2005  Jeff Franks jcfra...@xfce.org
- * Copyright (c) 2009  Jannis Pohlmann jan...@xfce.org
+ * Copyright (c) 2009-2010 Jannis Pohlmann jan...@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
@@ -482,6 +482,8 @@ thunar_application_uevent (GUdevClient   *client,
ThunarApplication *application)
 {
   const gchar *sysfs_path;
+  gboolean is_cdrom = FALSE;
+  gboolean has_media = FALSE;
   GSList  *lp;
 
   _thunar_return_if_fail (G_UDEV_IS_CLIENT (client));
@@ -493,8 +495,13 @@ thunar_application_uevent (GUdevClient   *client,
   /* determine the sysfs path of the device */
   sysfs_path = g_udev_device_get_sysfs_path (device);
 
-  /* distinguish between add, change and remove actions, ignore change 
and move */
-  if (g_strcmp0 (action, add) == 0) /* || g_strcmp0 (action, change) == 0) 
*/
+  /* check if the device is a CD drive */
+  is_cdrom = g_udev_device_get_property_as_boolean (device, ID_CDROM);
+  has_media = g_udev_device_get_property_as_boolean (device, ID_CDROM_MEDIA);
+
+  /* distinguish between add, change and remove actions, ignore move */
+  if (g_strcmp0 (action, add) == 0  
+  || (is_cdrom  has_media  g_strcmp0 (action, change) == 0))
 {
 #if 0
   g_debug (path = %s, action = %s, sysfs_path, action);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:jannis/port-to-udev Creating branch jannis/port-to-udev

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 as new branch
 to 698e2af7e376694c289e1d73800a11742eef9410 (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/jannis/port-to-udev

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:jannis/port-to-udev Add thunar-mount-notify/main.c to POTFILES.in.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 6e49959d690941e82fb69aae760fe9cc9fcd3261 (commit)
   from 56bb0025b40cea452511d2c14c1f6eff893b4c91 (commit)

commit 6e49959d690941e82fb69aae760fe9cc9fcd3261
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 18:24:03 2010 +0200

Add thunar-mount-notify/main.c to POTFILES.in.

 po/POTFILES.in |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index a067d77..f21d35d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -93,6 +93,8 @@ thunarx/thunarx-property-page.c
 thunarx/thunarx-provider-plugin.c
 thunarx/thunarx-renamer.c
 
+thunar-mount-notify/main.c
+
 plugins/thunar-apr/thunar-apr-abstract-page.c
 plugins/thunar-apr/thunar-apr-desktop-page.c
 plugins/thunar-apr/thunar-apr-image-page.c
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:jannis/port-to-udev Fix the application name in certain strings.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 9c5461e39c7bbf35fd15cb265402772307e11418 (commit)
   from 6e49959d690941e82fb69aae760fe9cc9fcd3261 (commit)

commit 9c5461e39c7bbf35fd15cb265402772307e11418
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 18:26:19 2010 +0200

Fix the application name in certain strings.

 thunar-mount-notify/main.c |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/thunar-mount-notify/main.c b/thunar-mount-notify/main.c
index c7cf8f8..a39e994 100644
--- a/thunar-mount-notify/main.c
+++ b/thunar-mount-notify/main.c
@@ -1,6 +1,7 @@
 /* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006-2007 Benedikt Meurer be...@xfce.org
+ * Copyright (c) 2010  Jannis Pohlmann jan...@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
@@ -156,12 +157,12 @@ main (int argc, char **argv)
 {
   /* no error message, the GUI initialization failed */
   display_name = gdk_get_display_arg_name ();
-  g_fprintf (stderr, exo-mount-notify: %s: %s\n, _(Failed to open 
display), (display_name != NULL) ? display_name :  );
+  g_fprintf (stderr, thunar-mount-notify: %s: %s\n, _(Failed to 
open display), (display_name != NULL) ? display_name :  );
 }
   else
 {
   /* yep, there's an error, so print it */
-  g_fprintf (stderr, exo-mount-notify: %s\n, err-message);
+  g_fprintf (stderr, thunar-mount-notify: %s\n, err-message);
 }
   return EXIT_FAILURE;
 }
@@ -195,7 +196,7 @@ main (int argc, char **argv)
 }
 
   /* try to initialize libnotify */
-  if (!notify_init (exo-mount))
+  if (!notify_init (thunar-mount-notify))
 {
   /* it doesn't make sense to continue from here on */
   g_printerr (%s: %s.\n, g_get_prgname (), Failed to initialize 
libnotify);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:master Also react on undev change events.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 877f0d2125336f041c6d618ae00a8974ff08baab (commit)
   from ce5c871fdf28b33f393a2ff26eacb4148372dbee (commit)

commit 877f0d2125336f041c6d618ae00a8974ff08baab
Author: Jannis Pohlmann jan...@xfce.org
Date:   Thu Jan 28 19:56:19 2010 +0100

Also react on undev change events.

 thunar/thunar-application.c |   71 +--
 1 files changed, 1 insertions(+), 70 deletions(-)

diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index b3709bc..32b6a83 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -103,11 +103,6 @@ static void   thunar_application_uevent
 (GUdevClient
  const gchar   
 *action,
  GUdevDevice   
 *device,
  
ThunarApplication  *application);
-#if 0
-static void   thunar_application_drive_eject
(GVolumeMonitor *volume_monitor,
- GDrive
 *drive,
- 
ThunarApplication  *application);
-#endif
 static gboolean   thunar_application_volman_idle(gpointer  
  user_data);
 static void   thunar_application_volman_idle_destroy(gpointer  
  user_data);
 static void   thunar_application_volman_watch   (GPid  
  pid,
@@ -220,14 +215,6 @@ thunar_application_init (ThunarApplication *application)
 }
 
 #ifdef HAVE_GUDEV
-#if 0
-  /* connect to the volume manager */
-  application-volume_monitor = g_volume_monitor_get ();
-
-  /* connect the volume manager support callbacks (used to spawn thunar-volman 
appropriately) */
-  g_signal_connect (application-volume_monitor, drive-eject-button, 
G_CALLBACK (thunar_application_drive_eject), application);
-#endif
-
   /* establish connection with udev */
   application-udev_client = g_udev_client_new (subsystems);
 
@@ -272,11 +259,6 @@ thunar_application_finalize (GObject *object)
   g_slist_foreach (application-volman_udis, (GFunc) g_free, NULL);
   g_slist_free (application-volman_udis);
 
-#if 0
-  /* disconnect from the volume monitor */
-  g_object_unref (application-volume_monitor);
-#endif
-
   /* disconnect from the udev client */
   g_object_unref (application-udev_client);
 #endif
@@ -512,7 +494,7 @@ thunar_application_uevent (GUdevClient   *client,
   sysfs_path = g_udev_device_get_sysfs_path (device);
 
   /* distinguish between add and remove actions, ignore change and 
move */
-  if (g_strcmp0 (action, add) == 0)
+  if (g_strcmp0 (action, add) == 0 || g_strcmp0 (action, change) == 0)
 {
   /* only insert the path if we don't have it already */
   if (g_slist_find_custom (application-volman_udis, sysfs_path, 
@@ -551,57 +533,6 @@ thunar_application_uevent (GUdevClient   *client,
 
 
 
-#if 0
-static void
-thunar_application_drive_eject (GVolumeMonitor*volume_monitor,
-GDrive*drive,
-ThunarApplication *application)
-{
-  GdkScreen *screen;
-  GError*err = NULL;
-  gchar *argv[4];
-  gchar *udi;
-
-  _thunar_return_if_fail (G_IS_VOLUME_MONITOR (volume_monitor));
-  _thunar_return_if_fail (application-volume_monitor == volume_monitor);
-  _thunar_return_if_fail (G_IS_DRIVE (drive));
-  _thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
-
-  /* determine the HAL UDI for this device */
-  udi = g_drive_get_identifier (drive, G_VOLUME_IDENTIFIER_KIND_HAL_UDI);
-
-  /* check if we have a UDI */
-  if (G_LIKELY (udi != NULL))
-{
-  /* generate the argument list for exo-eject */
-  argv[0] = (gchar *) exo-eject;
-  argv[1] = (gchar *) -h;
-  argv[2] = (gchar *) udi;
-  argv[3] = NULL;
-
-  /* locate the currently active screen (the one with the pointer) */
-  screen = xfce_gdk_screen_get_active (NULL);
-
-  /* try to spawn the volume_monitor on the active screen */
-  if (!gdk_spawn_on_screen (screen, NULL, argv, NULL, G_SPAWN_SEARCH_PATH, 
NULL, NULL, NULL, err))
-{
-  /* failed to launch exo-eject, inform the user about this */
-  thunar_dialogs_show_error (screen, err, _(Failed to execute 
\%s\), exo-eject);
-  g_error_free (err);
-}
-  else
-{
-  /* we most probably removed the device */
-  thunar_application_drive_disconnected (volume_monitor, drive, 
application);
-}
-
-  g_free (udi);
-}
-}
-#endif
-
-
-
 static gboolean
 thunar_application_volman_idle (gpointer user_data)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org

[Xfce4-commits] thunar:jannis/port-to-udev Use drive-removable-media as a fallback icon for notifications.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 5d4c994056a4775e3e13da333cd43f37e584f50f (commit)
   from 2a54a9f15f8bab70d738bb44e607fca05560acff (commit)

commit 5d4c994056a4775e3e13da333cd43f37e584f50f
Author: Jannis Pohlmann jan...@xfce.org
Date:   Fri Jul 23 13:41:24 2010 +0200

Use drive-removable-media as a fallback icon for notifications.

Also update POTFILES.in and the API documentation templates.

 docs/reference/thunarx/tmpl/thunarx-file-info.sgml |3 +++
 .../thunarx/tmpl/thunarx-menu-provider.sgml|3 +++
 .../thunarx/tmpl/thunarx-preferences-provider.sgml |3 +++
 .../tmpl/thunarx-property-page-provider.sgml   |3 +++
 .../thunarx/tmpl/thunarx-property-page.sgml|3 +++
 .../thunarx/tmpl/thunarx-provider-factory.sgml |4 
 .../thunarx/tmpl/thunarx-provider-plugin.sgml  |3 +++
 .../thunarx/tmpl/thunarx-renamer-provider.sgml |3 +++
 docs/reference/thunarx/tmpl/thunarx-renamer.sgml   |3 +++
 .../thunarx/tmpl/thunarx-version-information.sgml  |3 +++
 po/POTFILES.in |3 +--
 thunar/thunar-notify.c |   10 --
 12 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/docs/reference/thunarx/tmpl/thunarx-file-info.sgml 
b/docs/reference/thunarx/tmpl/thunarx-file-info.sgml
index fb89ab9..410a6cf 100644
--- a/docs/reference/thunarx/tmpl/thunarx-file-info.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-file-info.sgml
@@ -18,6 +18,9 @@ Abstraction of a file handled within the file manager
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxFileInfoIface # --
 para
   Interface with virtual methods implemented by the file manager and accessible
diff --git a/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml 
b/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml
index bc71743..5828d00 100644
--- a/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml
@@ -99,6 +99,9 @@ hello_get_file_actions (ThunarxMenuProvider *provider,
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxMenuProviderIface # --
 para
   Interface with virtual methods implemented by extensions that provide
diff --git a/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml 
b/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml
index 51fd132..684390a 100644
--- a/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml
@@ -83,6 +83,9 @@ hello_get_actions (ThunarxPreferencesProvider *provider,
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxPreferencesProviderIface # --
 para
   Interface with virtual methods implementation by extensions that
diff --git a/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml 
b/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml
index 80c6513..0a6339f 100644
--- a/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml
@@ -21,6 +21,9 @@ The interface to extensions that provide additional property 
pages
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxPropertyPageProvider # --
 para
   Property page provider type.
diff --git a/docs/reference/thunarx/tmpl/thunarx-property-page.sgml 
b/docs/reference/thunarx/tmpl/thunarx-property-page.sgml
index 2012a0e..53bc161 100644
--- a/docs/reference/thunarx/tmpl/thunarx-property-page.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-property-page.sgml
@@ -262,6 +262,9 @@ tag_page_set_file (TagPage *tag_page,
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxPropertyPage # --
 para
   Base instance type for property pages.
diff --git a/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml 
b/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml
index d7ce760..988a510 100644
--- a/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml
@@ -19,6 +19,9 @@ The provider factory support for applications
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxProviderFactory # --
 para
   The #ThunarxProviderFactory struct contains only private data. It should
@@ -31,6 +34,7 @@ Stable
 
 /para
 
+...@void: 
 @Returns: 
 
 
diff --git a/docs/reference/thunarx/tmpl/thunarx-provider-plugin.sgml 
b/docs/reference/thunarx/tmpl/thunarx-provider-plugin.sgml
index 2dbab0d..2c78acc 100644
--- a/docs/reference/thunarx/tmpl/thunarx-provider-plugin.sgml
+++ 

[Xfce4-commits] thunar:master Don't react to udev change events for now. They are a little weird.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 900c9e68d3b3325df6671df9858e70775fa62d0a (commit)
   from 877f0d2125336f041c6d618ae00a8974ff08baab (commit)

commit 900c9e68d3b3325df6671df9858e70775fa62d0a
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 16:15:48 2010 +0200

Don't react to udev change events for now. They are a little weird.

 thunar/thunar-application.c |   10 --
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 32b6a83..c885af6 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -493,9 +493,13 @@ thunar_application_uevent (GUdevClient   *client,
   /* determine the sysfs path of the device */
   sysfs_path = g_udev_device_get_sysfs_path (device);
 
-  /* distinguish between add and remove actions, ignore change and 
move */
-  if (g_strcmp0 (action, add) == 0 || g_strcmp0 (action, change) == 0)
+  /* distinguish between add, change and remove actions, ignore change 
and move */
+  if (g_strcmp0 (action, add) == 0) /* || g_strcmp0 (action, change) == 0) 
*/
 {
+#if 0
+  g_debug (path = %s, action = %s, sysfs_path, action);
+#endif
+
   /* only insert the path if we don't have it already */
   if (g_slist_find_custom (application-volman_udis, sysfs_path, 
(GCompareFunc) g_utf8_collate) == NULL)
@@ -559,6 +563,8 @@ thunar_application_volman_idle (gpointer user_data)
   argv[2] = application-volman_udis-data;
   argv[3] = NULL;
 
+  g_debug (  %s, g_strjoinv ( , argv));
+
   /* remove the first list item from the pending list */
   application-volman_udis = g_slist_delete_link 
(application-volman_udis, application-volman_udis);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:master React on change events of CD drives if they have media available.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 7c5ae37a16eac3f16925ce6e043e41eb498c357e (commit)
   from 900c9e68d3b3325df6671df9858e70775fa62d0a (commit)

commit 7c5ae37a16eac3f16925ce6e043e41eb498c357e
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 12:36:09 2010 +0200

React on change events of CD drives if they have media available.

 thunar/thunar-application.c |   13 ++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index c885af6..0b2e8d6 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -2,7 +2,7 @@
 /*-
  * Copyright (c) 2005-2007 Benedikt Meurer be...@xfce.org
  * Copyright (c) 2005  Jeff Franks jcfra...@xfce.org
- * Copyright (c) 2009  Jannis Pohlmann jan...@xfce.org
+ * Copyright (c) 2009-2010 Jannis Pohlmann jan...@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
@@ -482,6 +482,8 @@ thunar_application_uevent (GUdevClient   *client,
ThunarApplication *application)
 {
   const gchar *sysfs_path;
+  gboolean is_cdrom = FALSE;
+  gboolean has_media = FALSE;
   GSList  *lp;
 
   _thunar_return_if_fail (G_UDEV_IS_CLIENT (client));
@@ -493,8 +495,13 @@ thunar_application_uevent (GUdevClient   *client,
   /* determine the sysfs path of the device */
   sysfs_path = g_udev_device_get_sysfs_path (device);
 
-  /* distinguish between add, change and remove actions, ignore change 
and move */
-  if (g_strcmp0 (action, add) == 0) /* || g_strcmp0 (action, change) == 0) 
*/
+  /* check if the device is a CD drive */
+  is_cdrom = g_udev_device_get_property_as_boolean (device, ID_CDROM);
+  has_media = g_udev_device_get_property_as_boolean (device, ID_CDROM_MEDIA);
+
+  /* distinguish between add, change and remove actions, ignore move */
+  if (g_strcmp0 (action, add) == 0  
+  || (is_cdrom  has_media  g_strcmp0 (action, change) == 0))
 {
 #if 0
   g_debug (path = %s, action = %s, sysfs_path, action);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:master Fix the application name in certain strings.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 9c5461e39c7bbf35fd15cb265402772307e11418 (commit)
   from 6e49959d690941e82fb69aae760fe9cc9fcd3261 (commit)

commit 9c5461e39c7bbf35fd15cb265402772307e11418
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 18:26:19 2010 +0200

Fix the application name in certain strings.

 thunar-mount-notify/main.c |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/thunar-mount-notify/main.c b/thunar-mount-notify/main.c
index c7cf8f8..a39e994 100644
--- a/thunar-mount-notify/main.c
+++ b/thunar-mount-notify/main.c
@@ -1,6 +1,7 @@
 /* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
  * Copyright (c) 2006-2007 Benedikt Meurer be...@xfce.org
+ * Copyright (c) 2010  Jannis Pohlmann jan...@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
@@ -156,12 +157,12 @@ main (int argc, char **argv)
 {
   /* no error message, the GUI initialization failed */
   display_name = gdk_get_display_arg_name ();
-  g_fprintf (stderr, exo-mount-notify: %s: %s\n, _(Failed to open 
display), (display_name != NULL) ? display_name :  );
+  g_fprintf (stderr, thunar-mount-notify: %s: %s\n, _(Failed to 
open display), (display_name != NULL) ? display_name :  );
 }
   else
 {
   /* yep, there's an error, so print it */
-  g_fprintf (stderr, exo-mount-notify: %s\n, err-message);
+  g_fprintf (stderr, thunar-mount-notify: %s\n, err-message);
 }
   return EXIT_FAILURE;
 }
@@ -195,7 +196,7 @@ main (int argc, char **argv)
 }
 
   /* try to initialize libnotify */
-  if (!notify_init (exo-mount))
+  if (!notify_init (thunar-mount-notify))
 {
   /* it doesn't make sense to continue from here on */
   g_printerr (%s: %s.\n, g_get_prgname (), Failed to initialize 
libnotify);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:jannis/port-to-udev Listen to udev events for the usb subsystem.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 698e2af7e376694c289e1d73800a11742eef9410 (commit)
   from 5d4c994056a4775e3e13da333cd43f37e584f50f (commit)

commit 698e2af7e376694c289e1d73800a11742eef9410
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Jul 24 21:42:40 2010 +0200

Listen to udev events for the usb subsystem.

 thunar/thunar-application.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 0b2e8d6..5ab302a 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -195,7 +195,7 @@ static void
 thunar_application_init (ThunarApplication *application)
 {
 #ifdef HAVE_GUDEV
-  static const gchar *subsystems[] = { block, input, NULL };
+  static const gchar *subsystems[] = { block, input, usb, NULL };
 #endif
   gchar  *path;
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:master Use GUDev and sysfs paths to spawn thunar-volman on udev events.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to ce5c871fdf28b33f393a2ff26eacb4148372dbee (commit)
   from 00db7f70831a33db9490a961f8043b4f78210ee8 (commit)

commit ce5c871fdf28b33f393a2ff26eacb4148372dbee
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sun Jan 17 03:11:05 2010 +0100

Use GUDev and sysfs paths to spawn thunar-volman on udev events.

 configure.in.in |   33 +++
 thunar/Makefile.am  |7 ++-
 thunar/thunar-application.c |  137 ---
 3 files changed, 104 insertions(+), 73 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 5e6ff69..6892334 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -171,6 +171,12 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBSTARTUP_NOTIFICATION],
[0.4], [startup-notification],
[startup notification library])
 
+dnl ***
+dnl *** Optional support for GUDev (required for thunar-volman) ***
+dnl ***
+XDT_CHECK_OPTIONAL_PACKAGE([GUDEV], [gudev-1.0], [145], [gudev], 
+   [GUDev (required for thunar-volman)])
+
 dnl *
 dnl *** Check for gtk-doc ***
 dnl *
@@ -292,19 +298,24 @@ echo
 echo Build Configuration:
 echo
 if test x$DBUS_FOUND = xyes; then
-echo * D-BUS support: yes
+echo * D-BUS support:  yes
 else
-echo * D-BUS support: no
+echo * D-BUS support:  no
 fi
 if test x$GIO_UNIX_FOUND = xyes; then
-echo * GIO UNIX features: yes
+echo * GIO UNIX features:  yes
 else
-echo * GIO UNIX features: no
+echo * GIO UNIX features:  no
 fi
 if test x$LIBSTARTUP_NOTIFICATION_FOUND = xyes; then
-echo * Startup Notification:  yes
+echo * Startup Notification:   yes
+else
+echo * Startup Notification:   no
+fi
+if test x$GUDEV_FOUND = xyes; then
+echo * GUDev (required for thunar-volman): yes
 else
-echo * Startup Notification:  no
+echo * GUDev (required for thunar-volman): no
 fi
 echo * Debug Support: $enable_debug
 if test x$enable_gen_doc = xyes; then
@@ -317,9 +328,9 @@ fi
 echo
 echo Additional Plugins:
 echo
-echo * Advanced Properties:   $ac_bm_thunar_plugin_apr
-echo * Simple Builting Renamers:  $ac_bm_thunar_plugin_sbr
-echo * Trash Panel Applet:$ac_bm_thunar_plugin_tpa
-echo * User Customizable Actions: $ac_bm_thunar_plugin_uca
-echo * Wallpaper support: $ac_bm_thunar_plugin_wallpaper
+echo * Advanced Properties:$ac_bm_thunar_plugin_apr
+echo * Simple Builting Renamers:   $ac_bm_thunar_plugin_sbr
+echo * Trash Panel Applet: $ac_bm_thunar_plugin_tpa
+echo * User Customizable Actions:  $ac_bm_thunar_plugin_uca
+echo * Wallpaper support:  $ac_bm_thunar_plugin_wallpaper
 echo
diff --git a/thunar/Makefile.am b/thunar/Makefile.am
index 6c5b20c..436933d 100644
--- a/thunar/Makefile.am
+++ b/thunar/Makefile.am
@@ -12,6 +12,7 @@ INCLUDES =
\
-DPACKAGE_LOCALE_DIR=\$(localedir)\   \
-DTHUNAR_VERSION_API=\$(THUNAR_VERSION_API)\  \
-DSN_API_NOT_YET_FROZEN \
+   -DG_UDEV_API_IS_SUBJECT_TO_CHANGE   \
$(PLATFORM_CPPFLAGS)
 
 bin_SCRIPTS =  \
@@ -219,8 +220,9 @@ Thunar_SOURCES =
\
 
 Thunar_CFLAGS =
\
$(EXO_CFLAGS)   \
-   $(GTHREAD_CFLAGS)   \
$(GIO_CFLAGS)   \
+   $(GTHREAD_CFLAGS)   \
+   $(GUDEV_CFLAGS) \
$(LIBSM_CFLAGS) \
$(LIBSTARTUP_NOTIFICATION_CFLAGS)   \
$(LIBXFCE4UI_CFLAGS)\
@@ -235,8 +237,9 @@ Thunar_LDADD =  
\
$(top_builddir)/tdb/libtdb.la   \
$(top_builddir)/thunarx/libthunarx-$(THUNARX_VERSION_API).la\
$(EXO_LIBS) \
-   $(GTHREAD_LIBS) \
$(GIO_LIBS) \
+   $(GTHREAD_LIBS) \
+   $(GUDEV_LIBS)

[Xfce4-commits] thunar:jannis/port-to-udev Re-implement mount/eject notifications based on libnotify.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 2a54a9f15f8bab70d738bb44e607fca05560acff (commit)
   from 9c5461e39c7bbf35fd15cb265402772307e11418 (commit)

commit 2a54a9f15f8bab70d738bb44e607fca05560acff
Author: Jannis Pohlmann jan...@xfce.org
Date:   Fri Jul 23 10:01:07 2010 +0200

Re-implement mount/eject notifications based on libnotify.

Notifications are shown before the calls to g_volume_eject() and
g_mount_unmount(). They are closed in the finish callbacks.

 Makefile.am   |5 -
 configure.in.in   |1 -
 thunar-mount-notify/Makefile.am   |   46 -
 thunar-mount-notify/main.c|  270 -
 thunar/Makefile.am|   15 ++-
 thunar/main.c |   23 +++
 thunar/thunar-notify.c|  236 +
 thunar/{thunar-exec.h = thunar-notify.h} |   31 ++--
 thunar/thunar-shortcuts-view.c|   49 --
 thunar/thunar-tree-view.c |   52 --
 10 files changed, 353 insertions(+), 375 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 64a54ed..85226d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,10 +17,6 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-if HAVE_LIBNOTIFY
-THUNAR_MOUNT_NOTIFY_SUBDIR=thunar-mount-notify
-endif
-
 SUBDIRS =  \
icons   \
pixmaps \
@@ -29,7 +25,6 @@ SUBDIRS = 
\
tdb \
thunarx \
thunar  \
-   $(THUNAR_MOUNT_NOTIFY_SUBDIR)   \
docs\
examples\
plugins
diff --git a/configure.in.in b/configure.in.in
index f7ae8d6..640b75d 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -295,7 +295,6 @@ thunar/Makefile
 thunarx/Makefile
 thunarx/thunarx-2.pc
 thunarx/thunarx-config.h
-thunar-mount-notify/Makefile
 ])
 
 dnl ***
diff --git a/thunar-mount-notify/Makefile.am b/thunar-mount-notify/Makefile.am
deleted file mode 100644
index 1e72f22..000
--- a/thunar-mount-notify/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
-# -
-# Copyright (c) 2010 Jannis Pohlmann jan...@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 (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 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.
-
-INCLUDES = \
-   -I$(top_builddir)   \
-   -I$(top_srcdir) \
-   -DG_LOG_DOMAIN=\thunar-mount-notify\  \
-   -DPACKAGE_LOCALE_DIR=\$(localedir)\   \
-   $(PLATFORM_CPPFLAGS)
-
-libexec_PROGRAMS = \
-   thunar-mount-notify-1
-
-thunar_mount_notify_1_SOURCES =
\
-   main.c
-
-thunar_mount_notify_1_CFLAGS = \
-   $(GTK_CFLAGS)   \
-   $(LIBNOTIFY_CFLAGS) \
-   $(LIBXFCE4UTIL_CFLAGS)  \
-   $(PLATFORM_CFLAGS)
-
-thunar_mount_notify_1_LDFLAGS =
\
-   -no-undefined   \
-   $(PLATFORM_LDFLAGS)
-
-thunar_mount_notify_1_LDADD =  \
-   $(GTK_LIBS) \
-   $(LIBNOTIFY_LIBS)   \
-   $(LIBXFCE4UTIL_LIBS)
diff --git a/thunar-mount-notify/main.c b/thunar-mount-notify/main.c
deleted 

[Xfce4-commits] thunar:master Add thunar-mount-notify/main.c to POTFILES.in.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 6e49959d690941e82fb69aae760fe9cc9fcd3261 (commit)
   from 56bb0025b40cea452511d2c14c1f6eff893b4c91 (commit)

commit 6e49959d690941e82fb69aae760fe9cc9fcd3261
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 18:24:03 2010 +0200

Add thunar-mount-notify/main.c to POTFILES.in.

 po/POTFILES.in |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index a067d77..f21d35d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -93,6 +93,8 @@ thunarx/thunarx-property-page.c
 thunarx/thunarx-provider-plugin.c
 thunarx/thunarx-renamer.c
 
+thunar-mount-notify/main.c
+
 plugins/thunar-apr/thunar-apr-abstract-page.c
 plugins/thunar-apr/thunar-apr-desktop-page.c
 plugins/thunar-apr/thunar-apr-image-page.c
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:master Copy exo-mount-notify-1 over to thunar (as thunar-mount-notify-1).

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 56bb0025b40cea452511d2c14c1f6eff893b4c91 (commit)
   from 7c5ae37a16eac3f16925ce6e043e41eb498c357e (commit)

commit 56bb0025b40cea452511d2c14c1f6eff893b4c91
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 18:21:11 2010 +0200

Copy exo-mount-notify-1 over to thunar (as thunar-mount-notify-1).

Now all we need to do is integrate it into Thunar and thunar-volman.

 Makefile.am |   26 -
 configure.in.in |   20 +++-
 thunar-mount-notify/Makefile.am |   46 +++
 thunar-mount-notify/main.c  |  269 +++
 4 files changed, 354 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index dce959c..64a54ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,25 @@
-# $Id$
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+# -
+# Copyright (c) 2010 Jannis Pohlmann jan...@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 (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 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.
+
+if HAVE_LIBNOTIFY
+THUNAR_MOUNT_NOTIFY_SUBDIR=thunar-mount-notify
+endif
 
 SUBDIRS =  \
icons   \
@@ -8,6 +29,7 @@ SUBDIRS =  
\
tdb \
thunarx \
thunar  \
+   $(THUNAR_MOUNT_NOTIFY_SUBDIR)   \
docs\
examples\
plugins
@@ -95,5 +117,3 @@ DISTCLEANFILES = 
\
 DISTCHECK_CONFIGURE_FLAGS =\
--enable-gtk-doc\
--enable-gen-doc
-
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/configure.in.in b/configure.in.in
index 6892334..f7ae8d6 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -177,6 +177,12 @@ dnl 
***
 XDT_CHECK_OPTIONAL_PACKAGE([GUDEV], [gudev-1.0], [145], [gudev], 
[GUDev (required for thunar-volman)])
 
+dnl **
+dnl *** Optional support for libnotify ***
+dnl **
+XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.4.0], [notifications],
+   [Mount notification support], [yes])
+
 dnl *
 dnl *** Check for gtk-doc ***
 dnl *
@@ -289,6 +295,7 @@ thunar/Makefile
 thunarx/Makefile
 thunarx/thunarx-2.pc
 thunarx/thunarx-config.h
+thunar-mount-notify/Makefile
 ])
 
 dnl ***
@@ -317,13 +324,18 @@ echo * GUDev (required for thunar-volman): yes
 else
 echo * GUDev (required for thunar-volman): no
 fi
-echo * Debug Support: $enable_debug
+if test x$LIBNOTIFY_FOUND = xyes; then
+echo * Mount notification support: yes
+else
+echo * Mount notification support: no
+fi
+echo * Debug Support:  $enable_debug
 if test x$enable_gen_doc = xyes; then
-echo * Documentation: yes (generate)
+echo * Documentation:  yes (generate)
 elif test -d ${srcdir}/docs/manual/html; then
-echo * Documentation: yes (in tarball)
+echo * Documentation:  yes (in tarball)
 else
-echo * Documentation: no
+echo * Documentation:  no
 fi
 echo
 echo Additional Plugins:
diff --git a/thunar-mount-notify/Makefile.am b/thunar-mount-notify/Makefile.am
new file mode 100644
index 000..1e72f22
--- /dev/null
+++ b/thunar-mount-notify/Makefile.am
@@ -0,0 +1,46 @@
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+# -
+# Copyright (c) 2010 Jannis Pohlmann jan...@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 
+# 

[Xfce4-commits] thunar:master Re-implement mount/eject notifications based on libnotify.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 2a54a9f15f8bab70d738bb44e607fca05560acff (commit)
   from 9c5461e39c7bbf35fd15cb265402772307e11418 (commit)

commit 2a54a9f15f8bab70d738bb44e607fca05560acff
Author: Jannis Pohlmann jan...@xfce.org
Date:   Fri Jul 23 10:01:07 2010 +0200

Re-implement mount/eject notifications based on libnotify.

Notifications are shown before the calls to g_volume_eject() and
g_mount_unmount(). They are closed in the finish callbacks.

 Makefile.am   |5 -
 configure.in.in   |1 -
 thunar-mount-notify/Makefile.am   |   46 -
 thunar-mount-notify/main.c|  270 -
 thunar/Makefile.am|   15 ++-
 thunar/main.c |   23 +++
 thunar/thunar-notify.c|  236 +
 thunar/{thunar-exec.h = thunar-notify.h} |   31 ++--
 thunar/thunar-shortcuts-view.c|   49 --
 thunar/thunar-tree-view.c |   52 --
 10 files changed, 353 insertions(+), 375 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 64a54ed..85226d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,10 +17,6 @@
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-if HAVE_LIBNOTIFY
-THUNAR_MOUNT_NOTIFY_SUBDIR=thunar-mount-notify
-endif
-
 SUBDIRS =  \
icons   \
pixmaps \
@@ -29,7 +25,6 @@ SUBDIRS = 
\
tdb \
thunarx \
thunar  \
-   $(THUNAR_MOUNT_NOTIFY_SUBDIR)   \
docs\
examples\
plugins
diff --git a/configure.in.in b/configure.in.in
index f7ae8d6..640b75d 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -295,7 +295,6 @@ thunar/Makefile
 thunarx/Makefile
 thunarx/thunarx-2.pc
 thunarx/thunarx-config.h
-thunar-mount-notify/Makefile
 ])
 
 dnl ***
diff --git a/thunar-mount-notify/Makefile.am b/thunar-mount-notify/Makefile.am
deleted file mode 100644
index 1e72f22..000
--- a/thunar-mount-notify/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
-# -
-# Copyright (c) 2010 Jannis Pohlmann jan...@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 (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 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.
-
-INCLUDES = \
-   -I$(top_builddir)   \
-   -I$(top_srcdir) \
-   -DG_LOG_DOMAIN=\thunar-mount-notify\  \
-   -DPACKAGE_LOCALE_DIR=\$(localedir)\   \
-   $(PLATFORM_CPPFLAGS)
-
-libexec_PROGRAMS = \
-   thunar-mount-notify-1
-
-thunar_mount_notify_1_SOURCES =
\
-   main.c
-
-thunar_mount_notify_1_CFLAGS = \
-   $(GTK_CFLAGS)   \
-   $(LIBNOTIFY_CFLAGS) \
-   $(LIBXFCE4UTIL_CFLAGS)  \
-   $(PLATFORM_CFLAGS)
-
-thunar_mount_notify_1_LDFLAGS =
\
-   -no-undefined   \
-   $(PLATFORM_LDFLAGS)
-
-thunar_mount_notify_1_LDADD =  \
-   $(GTK_LIBS) \
-   $(LIBNOTIFY_LIBS)   \
-   $(LIBXFCE4UTIL_LIBS)
diff --git a/thunar-mount-notify/main.c b/thunar-mount-notify/main.c
deleted file mode 100644

[Xfce4-commits] thunar:master Listen to udev events for the usb subsystem.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 698e2af7e376694c289e1d73800a11742eef9410 (commit)
   from 5d4c994056a4775e3e13da333cd43f37e584f50f (commit)

commit 698e2af7e376694c289e1d73800a11742eef9410
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Jul 24 21:42:40 2010 +0200

Listen to udev events for the usb subsystem.

 thunar/thunar-application.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 0b2e8d6..5ab302a 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -195,7 +195,7 @@ static void
 thunar_application_init (ThunarApplication *application)
 {
 #ifdef HAVE_GUDEV
-  static const gchar *subsystems[] = { block, input, NULL };
+  static const gchar *subsystems[] = { block, input, usb, NULL };
 #endif
   gchar  *path;
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Deleting branch jannis/port-to-udev

[well, not really]

Deleting branch refs/heads/jannis/port-to-udev

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Creating branch jannis/port-to-udev

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 as new branch
 to 40f977ffa365ff38148acd8fcf2a95b875b3c842 (commit)

Branches are created implicitly by pushing. This mail only exists to 
let you know that there was code pushed to 

  refs/heads/jannis/port-to-udev

for the first time. Mails for the commits that lead to the creation 
of the branch will follow after this mail.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar:master Use drive-removable-media as a fallback icon for notifications.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 5d4c994056a4775e3e13da333cd43f37e584f50f (commit)
   from 2a54a9f15f8bab70d738bb44e607fca05560acff (commit)

commit 5d4c994056a4775e3e13da333cd43f37e584f50f
Author: Jannis Pohlmann jan...@xfce.org
Date:   Fri Jul 23 13:41:24 2010 +0200

Use drive-removable-media as a fallback icon for notifications.

Also update POTFILES.in and the API documentation templates.

 docs/reference/thunarx/tmpl/thunarx-file-info.sgml |3 +++
 .../thunarx/tmpl/thunarx-menu-provider.sgml|3 +++
 .../thunarx/tmpl/thunarx-preferences-provider.sgml |3 +++
 .../tmpl/thunarx-property-page-provider.sgml   |3 +++
 .../thunarx/tmpl/thunarx-property-page.sgml|3 +++
 .../thunarx/tmpl/thunarx-provider-factory.sgml |4 
 .../thunarx/tmpl/thunarx-provider-plugin.sgml  |3 +++
 .../thunarx/tmpl/thunarx-renamer-provider.sgml |3 +++
 docs/reference/thunarx/tmpl/thunarx-renamer.sgml   |3 +++
 .../thunarx/tmpl/thunarx-version-information.sgml  |3 +++
 po/POTFILES.in |3 +--
 thunar/thunar-notify.c |   10 --
 12 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/docs/reference/thunarx/tmpl/thunarx-file-info.sgml 
b/docs/reference/thunarx/tmpl/thunarx-file-info.sgml
index fb89ab9..410a6cf 100644
--- a/docs/reference/thunarx/tmpl/thunarx-file-info.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-file-info.sgml
@@ -18,6 +18,9 @@ Abstraction of a file handled within the file manager
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxFileInfoIface # --
 para
   Interface with virtual methods implemented by the file manager and accessible
diff --git a/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml 
b/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml
index bc71743..5828d00 100644
--- a/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-menu-provider.sgml
@@ -99,6 +99,9 @@ hello_get_file_actions (ThunarxMenuProvider *provider,
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxMenuProviderIface # --
 para
   Interface with virtual methods implemented by extensions that provide
diff --git a/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml 
b/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml
index 51fd132..684390a 100644
--- a/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-preferences-provider.sgml
@@ -83,6 +83,9 @@ hello_get_actions (ThunarxPreferencesProvider *provider,
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxPreferencesProviderIface # --
 para
   Interface with virtual methods implementation by extensions that
diff --git a/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml 
b/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml
index 80c6513..0a6339f 100644
--- a/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-property-page-provider.sgml
@@ -21,6 +21,9 @@ The interface to extensions that provide additional property 
pages
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxPropertyPageProvider # --
 para
   Property page provider type.
diff --git a/docs/reference/thunarx/tmpl/thunarx-property-page.sgml 
b/docs/reference/thunarx/tmpl/thunarx-property-page.sgml
index 2012a0e..53bc161 100644
--- a/docs/reference/thunarx/tmpl/thunarx-property-page.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-property-page.sgml
@@ -262,6 +262,9 @@ tag_page_set_file (TagPage *tag_page,
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxPropertyPage # --
 para
   Base instance type for property pages.
diff --git a/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml 
b/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml
index d7ce760..988a510 100644
--- a/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml
+++ b/docs/reference/thunarx/tmpl/thunarx-provider-factory.sgml
@@ -19,6 +19,9 @@ The provider factory support for applications
 !-- # SECTION Stability_Level # --
 Stable
 
+!-- # SECTION Image # --
+
+
 !-- # STRUCT ThunarxProviderFactory # --
 para
   The #ThunarxProviderFactory struct contains only private data. It should
@@ -31,6 +34,7 @@ Stable
 
 /para
 
+...@void: 
 @Returns: 
 
 
diff --git a/docs/reference/thunarx/tmpl/thunarx-provider-plugin.sgml 
b/docs/reference/thunarx/tmpl/thunarx-provider-plugin.sgml
index 2dbab0d..2c78acc 100644
--- a/docs/reference/thunarx/tmpl/thunarx-provider-plugin.sgml
+++ 

[Xfce4-commits] thunar-volman:jannis/port-to-udev Implement video CD/DVD autoplaying.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 4fee95888fe46deab053be73b121323467168ede (commit)
   from 86b67e880310d214507a29c2a0e98a751a120c91 (commit)

commit 4fee95888fe46deab053be73b121323467168ede
Author: Jannis Pohlmann jan...@xfce.org
Date:   Mon Jul 19 19:22:17 2010 +0200

Implement video CD/DVD autoplaying.

 .gitignore   |1 -
 thunar-volman/tvm-block-device.c |   92 +++---
 2 files changed, 86 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 689645c..53a839c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,3 @@ stamp-h1
 thunar-volman-settings
 thunar-volman-settings.desktop
 texput.log
-thunar-volman
diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 26c9483..118e383 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -44,9 +44,15 @@ typedef gboolean (*TvmBlockDeviceHandler) (TvmContext 
*context,
 
 
 
-static gboolean tvm_block_device_autobrowse (TvmContext *context,
- GMount *mount,
- GError**error);
+static gboolean tvm_file_test   (GMount  *mount,
+ const gchar *filename,
+ GFileTesttest);
+static gboolean tvm_block_device_autorun(TvmContext  *context,
+ GMount  *mount,
+ GError **error);
+static gboolean tvm_block_device_autobrowse (TvmContext  *context,
+ GMount  *mount,
+ GError **error);
 
 
 
@@ -55,14 +61,90 @@ static TvmBlockDeviceHandler block_device_handlers[] =
 #if 0
   tvm_block_device_autoipod,
   tvm_block_device_autophoto,
-  tvm_block_device_autorun,
 #endif
+  tvm_block_device_autorun,
   tvm_block_device_autobrowse,
 };
 
 
 
 static gboolean
+tvm_file_test (GMount  *mount,
+   const gchar *filename,
+   GFileTesttest)
+{
+  gboolean result = FALSE;
+  GFile   *mount_point;
+  gchar   *mount_path;
+  gchar   *absolute_path;
+
+  g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
+  g_return_val_if_fail (filename != NULL  *filename != '\0', FALSE);
+
+  mount_point = g_mount_get_root (mount);
+  mount_path = g_file_get_path (mount_point);
+  g_object_unref (mount_point);
+
+  absolute_path = g_build_filename (mount_path, filename, NULL);
+  g_free (mount_path);
+
+  result = g_file_test (absolute_path, test);
+  g_free (absolute_path);
+
+  return result;
+}
+
+
+
+static gboolean
+tvm_block_device_autorun (TvmContext *context,
+  GMount *mount,
+  GError**error)
+{
+  gboolean autoplay;
+  gboolean result = FALSE;
+  GError  *err = NULL;
+  gchar   *autoplay_command;
+
+  g_return_val_if_fail (context != NULL, FALSE);
+  g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  /* check if autoplaying video CDs and DVDs is enabled */
+  autoplay = xfconf_channel_get_bool (context-channel, 
+  /autoplay-video-cds/enabled, FALSE);
+  if (autoplay)
+{
+  /* check if we have a video CD or video DVD here */
+  if (tvm_file_test (mount, vcd, G_FILE_TEST_IS_DIR) 
+  || tvm_file_test (mount, video_ts, G_FILE_TEST_IS_DIR))
+{
+  /* determine the autoplay command for video CDs/DVDs */
+  autoplay_command = xfconf_channel_get_string (context-channel,
+
/autoplay-video-cds/command, 
+parole);
+
+  /* try to spawn the preferred video CD/DVD player */
+  result = tvm_run_command (context, mount, autoplay_command, err);
+
+  /* free the command string */
+  g_free (autoplay_command);
+
+  /* forward errors to the caller */
+  if (err != NULL)
+g_propagate_error (error, err);
+
+  /* return success/failure to the caller */
+  return result;
+}
+}
+
+  return TRUE;
+}
+
+
+
+static gboolean
 tvm_block_device_autobrowse (TvmContext *context,
  GMount *mount,
  GError**error)
@@ -128,8 +210,6 @@ tvm_block_device_mount_finish (GVolume  *volume,
   g_return_if_fail (G_IS_ASYNC_RESULT (result));
   g_return_if_fail (context != NULL);
 
-  g_debug (finish);
-
   /* finish mounting the volume */
   if (g_volume_mount_finish (volume, result, error))
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Make tvm_file_test() case insensitive so that video_ts equals VIDEO_TS.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 81c12834783b92f0784dca25a82277ee5afb20bc (commit)
   from 4fee95888fe46deab053be73b121323467168ede (commit)

commit 81c12834783b92f0784dca25a82277ee5afb20bc
Author: Jannis Pohlmann jan...@xfce.org
Date:   Mon Jul 19 19:33:22 2010 +0200

Make tvm_file_test() case insensitive so that video_ts equals VIDEO_TS.

This fixes a few problems with video CD/DVD autoplay.

 thunar-volman/tvm-block-device.c |   43 +
 1 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 118e383..5d919a0 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -73,23 +73,46 @@ tvm_file_test (GMount  *mount,
const gchar *filename,
GFileTesttest)
 {
-  gboolean result = FALSE;
-  GFile   *mount_point;
-  gchar   *mount_path;
-  gchar   *absolute_path;
+  const gchar *name;
+  gboolean result = FALSE;
+  GFile   *mount_point;
+  gchar   *directory;
+  gchar   *path;
+  GDir*dp;
 
   g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
   g_return_val_if_fail (filename != NULL  *filename != '\0', FALSE);
 
   mount_point = g_mount_get_root (mount);
-  mount_path = g_file_get_path (mount_point);
+  directory = g_file_get_path (mount_point);
   g_object_unref (mount_point);
 
-  absolute_path = g_build_filename (mount_path, filename, NULL);
-  g_free (mount_path);
+  /* try to open the specified directory */
+  dp = g_dir_open (directory, 0, NULL);
+  if (G_LIKELY (dp != NULL))
+{
+  while (!result)
+{
+  /* read the next entry */
+  name = g_dir_read_name (dp);
+  if (G_UNLIKELY (name == NULL))
+break;
+
+  /* check if we have a potential match */
+  if (g_ascii_strcasecmp (name, filename) == 0)
+{
+  /* check if test condition met */
+  path = g_build_filename (directory, name, NULL);
+  result = g_file_test (path, test);
+  g_free (path);
+}
+}
+
+  /* cleanup */
+  g_dir_close (dp);
+}
 
-  result = g_file_test (absolute_path, test);
-  g_free (absolute_path);
+  g_free (directory);
 
   return result;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Properly exit when the CD/DVD drive has no media.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to ccafc02e8cce0bc104af60012d8c2c493ed5327e (commit)
   from 81c12834783b92f0784dca25a82277ee5afb20bc (commit)

commit ccafc02e8cce0bc104af60012d8c2c493ed5327e
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 11:21:25 2010 +0200

Properly exit when the CD/DVD drive has no media.

 INSTALL  |  199 +++---
 thunar-volman/tvm-block-device.c |7 +-
 2 files changed, 171 insertions(+), 35 deletions(-)

diff --git a/INSTALL b/INSTALL
index 5458714..7d1c323 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,18 +2,24 @@ Installation Instructions
 *
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==
 
-Briefly, the shell commands `./configure; make; make install' should
+   Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@ may remove or edit it.
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
  `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
- documentation.
-
-  5. You can remove the program binaries and object files from the
+ documentation.  When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything.  Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+  6. You can remove the program binaries and object files from the
  source code directory by typing `make clean'.  To also remove the
  files that `configure' created (so you can compile the package for
  a different kind of computer), type `make distclean'.  There is
@@ -67,12 +83,22 @@ The simplest way to compile this package is:
  all sorts of other programs in order to regenerate files that came
  with the distribution.
 
+  7. Often, you can also type `make uninstall' to remove the installed
+ files again.  In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
 Compilers and Options
 =
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
You can give `configure' initial values for configuration parameters
 by setting variables in the command line or 

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add support for opening autorun.exe files with wine.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to a1cb43a6485957a74c35f58dd42022d7116f00b7 (commit)
   from fef3c1273d39bfb04c818d379d43db09a5c0323b (commit)

commit a1cb43a6485957a74c35f58dd42022d7116f00b7
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 12:39:46 2010 +0200

Add support for opening autorun.exe files with wine.

 thunar-volman/tvm-block-device.c |   52 ++
 1 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 7c999e9..d9c4d9f 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -134,6 +134,7 @@ tvm_block_device_autorun (TvmContext *context,
   gchar   *autoplay_command;
   gchar   *message;
   gchar   *mount_path;
+  gchar   *wine;
   guintn;
   gint response;
 
@@ -219,6 +220,57 @@ tvm_block_device_autorun (TvmContext *context,
 }
 }
 }
+
+  /* check if wine is present */
+  wine = g_find_program_in_path (wine);
+  if (wine != NULL)
+{
+  /* check if we have an autorun.exe file */
+  if (tvm_file_test (mount, autorun.exe, G_FILE_TEST_IS_REGULAR))
+{
+  /* prompt the user to execute this file */
+  message = g_strdup_printf (_(Would you like to allow \%s\ to 
run?),
+ autorun.exe);
+  response = tvm_prompt (context, gnome-fs-executable, 
+ _(Auto-Run Confirmation),
+ _(Auto-Run capability detected), 
message,
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(_Allow Auto-Run), 
TVM_RESPONSE_AUTORUN,
+ NULL);
+  g_free (message);
+
+  /* check if we should run autogen.exe */
+  if (response == TVM_RESPONSE_AUTORUN)
+{
+  /* determine the mount point as a string */
+  mount_point = g_mount_get_root (mount);
+  mount_path = g_file_get_path (mount_point);
+  g_object_unref (mount_point);
+
+  /* prepare argv to launch the autorun file */
+  argv = g_new0 (gchar *, 3);
+  argv[0] = g_strdup (wine);
+  argv[1] = g_strdup (autorun.exe);
+  argv[2] = NULL;
+
+  /* try to launch the autorun file */
+  result = g_spawn_async (mount_path, argv, NULL, 0, NULL, 
NULL, NULL,
+  error);
+  
+  /* free strings */
+  g_strfreev (argv);
+  g_free (mount_path);
+
+  /* free path to wine */
+  g_free (wine);
+
+  return result;
+}
+}
+
+  /* free path to wine */
+  g_free (wine);
+}
 }
 
   return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add support for USB media players and iPods.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 2359de82d71b8bfa89fc06e0b4abdd8e44c9ee3b (commit)
   from a75667cca11293e4f6582ac219f32b92cfbb9462 (commit)

commit 2359de82d71b8bfa89fc06e0b4abdd8e44c9ee3b
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 15:16:54 2010 +0200

Add support for USB media players and iPods.

 thunar-volman/tvm-block-device.c |  115 +-
 1 files changed, 113 insertions(+), 2 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index dfe570b..268d41a 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -53,6 +53,9 @@ typedef gboolean (*TvmBlockDeviceHandler) (TvmContext 
*context,
 static gboolean tvm_file_test   (GMount  *mount,
  const gchar *filename,
  GFileTesttest);
+static gboolean tvm_block_device_autoipod   (TvmContext  *context,
+ GMount  *mount,
+ GError **error);
 static gboolean tvm_block_device_autophoto  (TvmContext  *context,
  GMount  *mount,
  GError **error);
@@ -67,9 +70,7 @@ static gboolean tvm_block_device_autobrowse (TvmContext  
*context,
 
 static TvmBlockDeviceHandler block_device_handlers[] =
 {
-#if 0
   tvm_block_device_autoipod,
-#endif
   tvm_block_device_autophoto,
   tvm_block_device_autorun,
   tvm_block_device_autobrowse,
@@ -129,6 +130,116 @@ tvm_file_test (GMount  *mount,
 
 
 static gboolean
+tvm_block_device_autoipod (TvmContext *context,
+   GMount *mount,
+   GError**error)
+{
+  gboolean autoipod;
+  gboolean is_audio_player = FALSE;
+  gboolean is_ipod = FALSE;
+  gboolean result = FALSE;
+  GFile   *mount_point;
+  gchar   *autoipod_command;
+  gchar   *autophoto_command;
+  gchar   *mount_path;
+  gchar   *path_dcim = NULL;
+  gint response = TVM_RESPONSE_NONE;
+
+  g_return_val_if_fail (context != NULL, FALSE);
+  g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  autoipod = xfconf_channel_get_bool (context-channel, /autoipod/enabled, 
FALSE);
+  if (autoipod)
+{
+  /* check if we have a portable audio player here */
+  is_audio_player = g_udev_device_has_property (context-device, 
+ID_MEDIA_PLAYER);
+
+  /* check if we have an iPod */
+  is_ipod = g_strcmp0 (g_udev_device_get_property (context-device, 
+   ID_MODEL), iPod) == 
0;
+  if (is_ipod)
+{
+  /* determine the mount point path */
+  mount_point = g_mount_get_root (mount);
+  mount_path = g_file_get_path (mount_point);
+  g_object_unref (mount_point);
+
+  /* build dcim path */
+  path_dcim = g_build_filename (mount_path, dcim, NULL);
+  g_free (mount_path);
+
+  /* check if the iPod has photos */
+  if (!g_file_test (path_dcim, G_FILE_TEST_IS_DIR))
+{
+  /* no photos */
+  g_free (path_dcim);
+  path_dcim = NULL;
+}
+}
+
+  autoipod_command = xfconf_channel_get_string (context-channel,
+/autoipod/command, NULL);
+  autophoto_command = xfconf_channel_get_string (context-channel,
+ /autophoto/command, 
NULL);
+
+  /* check if autophoto command is specified, otherwise we cannot handle 
the photos 
+   * on the iPod anyway */
+  if (autophoto_command == NULL || *autophoto_command == '\0')
+{
+  g_free (path_dcim);
+  path_dcim = NULL;
+}
+
+  /* iPods can carry music and photos... */
+  if (path_dcim != NULL)
+{
+  /* ...so we need to prompt what to do */
+  response = tvm_prompt (context, gnome-dev-ipod, _(Photos and 
Music),
+ _(Photos were found on your portable music 
player),
+ _(Would you like to import the photos or 
manage the 
+   music?),
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(Import _Photos), TVM_RESPONSE_PHOTOS,
+ _(Manage _Music), TVM_RESPONSE_MUSIC,
+ NULL);
+}
+  else if (is_audio_player)
+{
+  response = TVM_RESPONSE_MUSIC;
+}
+
+  /* check what to do */
+  if (response == TVM_RESPONSE_MUSIC)
+{
+  /* run the preferred application to manage music players */
+ 

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add support for blank CDs and DVDs by launching the burn software.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 269de460833d282df34812bbaffc7f8b0dbe67bf (commit)
   from ccafc02e8cce0bc104af60012d8c2c493ed5327e (commit)

commit 269de460833d282df34812bbaffc7f8b0dbe67bf
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 11:42:45 2010 +0200

Add support for blank CDs and DVDs by launching the burn software.

 configure.in.in|1 +
 thunar-volman/Makefile.am  |6 +
 thunar-volman/tvm-block-device.c   |   11 +-
 thunar-volman/tvm-pango-extensions.c   |  178 
 .../{tvm-run.h = tvm-pango-extensions.h}  |   22 ++--
 thunar-volman/tvm-prompt.c |  175 +++
 thunar-volman/{tvm-block-device.h = tvm-prompt.h} |   28 +++-
 thunar-volman/tvm-run.c|  138 ++-
 thunar-volman/tvm-run.h|   10 +-
 9 files changed, 536 insertions(+), 33 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 439e9ad..1a40559 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -86,6 +86,7 @@ XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
 XDT_CHECK_PACKAGE([GUDEV], [gudev-1.0], [145])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0])
 
diff --git a/thunar-volman/Makefile.am b/thunar-volman/Makefile.am
index 66aa8e9..72d6a5f 100644
--- a/thunar-volman/Makefile.am
+++ b/thunar-volman/Makefile.am
@@ -40,6 +40,10 @@ thunar_volman_SOURCES =  
\
tvm-device.h\
tvm-gio-extensions.c\
tvm-gio-extensions.h\
+   tvm-pango-extensions.c  \
+   tvm-pango-extensions.h  \
+   tvm-prompt.c\
+   tvm-prompt.h\
tvm-run.c   \
tvm-run.h
 
@@ -50,6 +54,7 @@ thunar_volman_CFLAGS =
\
$(GTHREAD_CFLAGS)   \
$(GTK_CFLAGS)   \
$(GUDEV_CFLAGS) \
+   $(LIBXFCE4UI_CFLAGS)\
$(LIBXFCE4UTIL_CFLAGS)  \
$(XFCONF_CFLAGS)\
$(PLATFORM_CFLAGS)
@@ -65,5 +70,6 @@ thunar_volman_LDADD = 
\
$(GTHREAD_LIBS) \
$(GTK_LIBS) \
$(GUDEV_LIBS)   \
+   $(LIBXFCE4UI_LIBS)  \
$(LIBXFCE4UTIL_LIBS)\
$(XFCONF_LIBS)
diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index d111884..42ed5f4 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -326,6 +326,7 @@ tvm_block_device_added (TvmContext *context)
   gboolean is_partition;
   gboolean is_volume;
   guint64  audio_tracks;
+  GError  *error = NULL;
 
   g_return_if_fail (context != NULL);
 
@@ -352,11 +353,15 @@ tvm_block_device_added (TvmContext *context)
 g_udev_device_get_property_as_uint64 (context-device, 
   
ID_CDROM_MEDIA_TRACK_COUNT_AUDIO);
 
+  /* check if we have a blank CD/DVD here */
   if (g_strcmp0 (media_state, blank) == 0)
 {
-#if 0
-  tvm_run_burn_software (client, device, channel, error);
-#endif
+  /* try to run the burn program */
+  if (!tvm_run_burn_software (context, error))
+g_propagate_error (context-error, error);
+
+  /* finish processing the device */
+  tvm_device_handler_finished (context);
 }
   else if (audio_tracks  0)
 {
diff --git a/thunar-volman/tvm-pango-extensions.c 
b/thunar-volman/tvm-pango-extensions.c
new file mode 100644
index 000..d7f68fb
--- /dev/null
+++ b/thunar-volman/tvm-pango-extensions.c
@@ -0,0 +1,178 @@
+/* vi:set et ai sw=2 sts=2 ts=2: */
+/*-
+ * Copyright (c) 2006-2007 Benedikt Meurer be...@xfce.org
+ *
+ * This program is free 

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add support for keyboards, mice and tablets.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 916ddd8e49cba6cd4912b3efa01f7945718eb33b (commit)
   from 2359de82d71b8bfa89fc06e0b4abdd8e44c9ee3b (commit)

commit 916ddd8e49cba6cd4912b3efa01f7945718eb33b
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 16:01:48 2010 +0200

Add support for keyboards, mice and tablets.

 thunar-volman/Makefile.am  |2 +
 thunar-volman/tvm-device.c |3 +-
 thunar-volman/tvm-input-device.c   |  109 
 .../{tvm-block-device.h = tvm-input-device.h} |8 +-
 4 files changed, 117 insertions(+), 5 deletions(-)

diff --git a/thunar-volman/Makefile.am b/thunar-volman/Makefile.am
index 72d6a5f..9d9153d 100644
--- a/thunar-volman/Makefile.am
+++ b/thunar-volman/Makefile.am
@@ -40,6 +40,8 @@ thunar_volman_SOURCES =   
\
tvm-device.h\
tvm-gio-extensions.c\
tvm-gio-extensions.h\
+   tvm-input-device.c  \
+   tvm-input-device.h  \
tvm-pango-extensions.c  \
tvm-pango-extensions.h  \
tvm-prompt.c\
diff --git a/thunar-volman/tvm-device.c b/thunar-volman/tvm-device.c
index 6c0c045..4da3aae 100644
--- a/thunar-volman/tvm-device.c
+++ b/thunar-volman/tvm-device.c
@@ -33,6 +33,7 @@
 #include thunar-volman/tvm-block-device.h
 #include thunar-volman/tvm-context.h
 #include thunar-volman/tvm-device.h
+#include thunar-volman/tvm-input-device.h
 
 
 
@@ -55,8 +56,8 @@ struct _TvmDeviceHandler
 static TvmDeviceHandler subsystem_handlers[] = 
 {
   { block,   tvm_block_device_added },
-#if 0
   { input,   tvm_input_device_added },
+#if 0
   { sound,   tvm_sound_device_added },
   { video4linux, tvm_video_device_added },
 #endif
diff --git a/thunar-volman/tvm-input-device.c b/thunar-volman/tvm-input-device.c
new file mode 100644
index 000..bae1e7c
--- /dev/null
+++ b/thunar-volman/tvm-input-device.c
@@ -0,0 +1,109 @@
+/* vi:set et ai sw=2 sts=2 ts=2: */
+/*-
+ * Copyright (c) 2010 Jannis Pohlmann jan...@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 (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 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
+
+#include gudev/gudev.h
+
+#include libxfce4util/libxfce4util.h
+
+#include thunar-volman/tvm-input-device.h
+#include thunar-volman/tvm-context.h
+#include thunar-volman/tvm-device.h
+#include thunar-volman/tvm-run.h
+
+
+
+void
+tvm_input_device_added (TvmContext *context)
+{
+  const gchar *id_class;
+  const gchar *id_model;
+  const gchar *driver;
+  const gchar *enabled_property = NULL;
+  const gchar *command_property = NULL;
+  gboolean enabled;
+  gchar   *command;
+
+  g_return_if_fail (context != NULL);
+
+  /* collect device information */
+  id_class = g_udev_device_get_property (context-device, ID_CLASS);
+  id_model = g_udev_device_get_property (context-device, ID_MODEL);
+  driver = g_udev_device_get_property (context-device, DRIVER);
+
+  if (g_strcmp0 (id_class, kbd) == 0)
+{
+  /* we have a keyboard */
+  enabled_property = /autokeyboard/enabled;
+  command_property = /autokeyboard/command;
+}
+  else if (g_strcmp0 (driver, wacom) == 0)
+{
+  /* we have a wacom tablet */
+  enabled_property = /autotablet/enabled;
+  command_property = /autotabled/command;
+}
+  else if (g_strcmp0 (id_class, mouse) == 0)
+{
+  if (g_strstr_len (id_model, -1, Tablet) != NULL 
+  || g_strstr_len (id_model, -1, TABLET) != NULL
+  || g_strstr_len (id_model, -1, tablet) != NULL)
+{
+  /* we have a tablet that can be used as a mouse */
+  enabled_property = /autotablet/enabled;
+  command_property = /autotablet/command;
+}
+  else
+{
+  /* we have a normal mouse */
+  enabled_property = /automouse/enabled;
+  command_property = /automouse/command;
+}
+}
+
+  

[Xfce4-commits] thunar-volman:jannis/port-to-udev Implement autoopen (requires an .autoopen or autoopen file).

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to d7fb1ad549e9b090b03ccfde1df46771c4b7863c (commit)
   from a1cb43a6485957a74c35f58dd42022d7116f00b7 (commit)

commit d7fb1ad549e9b090b03ccfde1df46771c4b7863c
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 13:06:34 2010 +0200

Implement autoopen (requires an .autoopen or autoopen file).

This finishes our implementation of the Desktop Application Autostart
Specification.

 thunar-volman/tvm-block-device.c |  119 +
 1 files changed, 106 insertions(+), 13 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index d9c4d9f..81cffb2 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -1,6 +1,7 @@
 /* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
- * Copyright (c) 2010 Jannis Pohlmann jan...@xfce.org
+ * Copyright (c) 2007-2008 Benedikt Meurer be...@xfce.org
+ * Copyright (c) 2010  Jannis Pohlmann jan...@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
@@ -22,6 +23,10 @@
 #include config.h
 #endif
 
+#ifdef HAVE_SYS_STAT_H
+#include sys/stat.h
+#endif
+
 #include gio/gio.h
 
 #include gtk/gtk.h
@@ -125,18 +130,24 @@ tvm_block_device_autorun (TvmContext *context,
   GMount *mount,
   GError**error)
 {
-  gboolean autoplay;
-  gboolean autorun;
-  gboolean result = FALSE;
-  GError  *err = NULL;
-  GFile   *mount_point;
-  gchar  **argv;
-  gchar   *autoplay_command;
-  gchar   *message;
-  gchar   *mount_path;
-  gchar   *wine;
-  guintn;
-  gint response;
+  struct stat statb_mount_point;
+  struct stat statb_autoopen;
+  gbooleanautoopen;
+  gbooleanautoplay;
+  gbooleanautorun;
+  gbooleanresult = FALSE;
+  GError *err = NULL;
+  GFile  *mount_point;
+  gchar **argv;
+  gchar  *autoplay_command;
+  gchar  *message;
+  gchar  *mount_path;
+  gchar  *path_autoopen;
+  gchar  *wine;
+  gchar   line[1024];
+  guint   n;
+  FILE   *fp;
+  gintresponse;
 
   g_return_val_if_fail (context != NULL, FALSE);
   g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
@@ -273,6 +284,88 @@ tvm_block_device_autorun (TvmContext *context,
 }
 }
 
+ /* check if autoopen support is enabled */
+  autoopen = xfconf_channel_get_bool (context-channel, /autoopen/enabled, 
FALSE);
+  if (autoopen)
+{
+  /* Autoopen Files (Desktop Application Autostart Specification) */
+  static const gchar *autoopen_files[] = { .autoopen, autoopen };
+  for (n = 0; n  G_N_ELEMENTS (autoopen_files); ++n)
+{
+  /* determine the moint point path */
+  mount_point = g_mount_get_root (mount);
+  mount_path = g_file_get_path (mount_point);
+  g_object_unref (mount_point);
+
+  /* check if one of the autoopen files is present */
+  path_autoopen = g_build_filename (mount_path, autoopen_files[n], 
NULL);
+  fp = fopen (path_autoopen, r);
+  g_free (path_autoopen);
+
+  /* check if the file could be opened */
+  if (G_UNLIKELY (fp != NULL))
+{
+  /* read the first line of the file (MUST NOT be an absolute 
path) */
+  if (fgets (line, sizeof (line), fp) != NULL  
!g_path_is_absolute (line))
+{
+  /* determine the absolute path of the file */
+  path_autoopen = g_build_filename (mount_path, g_strstrip 
(line), NULL);
+
+  /* the file must exist on exactly this device */
+  if (stat (mount_path, statb_mount_point) == 0 
+   stat (path_autoopen, statb_autoopen) == 0
+   S_ISREG (statb_autoopen.st_mode) 
+   (statb_autoopen.st_mode  0111) == 0
+   (statb_mount_point.st_dev == statb_autoopen.st_dev))
+{
+  /* prompt the user whether to autoopen this file */
+  message = g_strdup_printf (_(Would you like to open 
\%s\?), 
+ autoopen_files[n]);
+  response = tvm_prompt (context, gnome-fs-executable, 
+ _(Auto-Open Confirmation),
+ _(Auto-Open capability 
detected), message,
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(_Open), TVM_RESPONSE_AUTORUN,
+ NULL);
+  g_free (message);
+
+  /* check if we should autoopen */
+  if (response == TVM_RESPONSE_AUTORUN)
+{
+  /* prepare the command to autoopen */
+   

[Xfce4-commits] thunar-volman:jannis/port-to-udev Implement autorun support (requires .autorun, autorun or autorun.sh).

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to fef3c1273d39bfb04c818d379d43db09a5c0323b (commit)
   from 269de460833d282df34812bbaffc7f8b0dbe67bf (commit)

commit fef3c1273d39bfb04c818d379d43db09a5c0323b
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 12:25:59 2010 +0200

Implement autorun support (requires .autorun, autorun or autorun.sh).

This is the first step towards support of the Desktop Application
Autostart Specification. The next step is autoopen support.

 thunar-volman/tvm-block-device.c |   61 +-
 thunar-volman/tvm-run.c  |2 +-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 42ed5f4..7c999e9 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -34,6 +34,7 @@
 #include thunar-volman/tvm-context.h
 #include thunar-volman/tvm-device.h
 #include thunar-volman/tvm-gio-extensions.h
+#include thunar-volman/tvm-prompt.h
 #include thunar-volman/tvm-run.h
 
 
@@ -125,9 +126,16 @@ tvm_block_device_autorun (TvmContext *context,
   GError**error)
 {
   gboolean autoplay;
+  gboolean autorun;
   gboolean result = FALSE;
   GError  *err = NULL;
+  GFile   *mount_point;
+  gchar  **argv;
   gchar   *autoplay_command;
+  gchar   *message;
+  gchar   *mount_path;
+  guintn;
+  gint response;
 
   g_return_val_if_fail (context != NULL, FALSE);
   g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
@@ -162,7 +170,58 @@ tvm_block_device_autorun (TvmContext *context,
 }
 }
 
-  return TRUE;
+  /* check if autorun is enabled */
+  autorun = xfconf_channel_get_bool (context-channel, /autorun/enabled, 
FALSE);
+  if (autorun)
+{
+  /* Autostart files according to the Desktop Application Autostart
+   * Specification */
+  static const gchar *autorun_files[] = { .autorun, autorun, 
autorun.sh };
+  for (n = 0; n  G_N_ELEMENTS (autorun_files); ++n) 
+{
+  /* check if one of the autorun files is present and executable */
+  if (tvm_file_test (mount, autorun_files[n], 
G_FILE_TEST_IS_EXECUTABLE)
+   tvm_file_test (mount, autorun_files[n], 
G_FILE_TEST_IS_REGULAR))
+{
+  /* prompt the user to execute the file */
+  message = g_strdup_printf (_(Would you like to allow \%s\ to 
run?),
+ autorun_files[n]);
+  response = tvm_prompt (context, gnome-fs-executable, 
+ _(Auto-Run Confirmation),
+ _(Auto-Run capability detected), 
message,
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(_Allow Auto-Run), 
TVM_RESPONSE_AUTORUN,
+ NULL);
+  g_free (message);
+
+  /* check if we should autorun */
+  if (response == TVM_RESPONSE_AUTORUN)
+{
+  /* determine the mount point as a string */
+  mount_point = g_mount_get_root (mount);
+  mount_path = g_file_get_path (mount_point);
+  g_object_unref (mount_point);
+
+  /* prepare argv to launch the autorun file */
+  argv = g_new0 (gchar *, 2);
+  argv[0] = g_build_filename (mount_path, autorun_files[n], 
NULL);
+  argv[1] = NULL;
+
+  /* try to launch the autorun file */
+  result = g_spawn_async (mount_path, argv, NULL, 0, NULL, 
NULL, NULL,
+  error);
+  
+  /* free strings */
+  g_strfreev (argv);
+  g_free (mount_path);
+
+  return result;
+}
+}
+}
+}
+
+  return FALSE;
 }
 
 
diff --git a/thunar-volman/tvm-run.c b/thunar-volman/tvm-run.c
index 571047d..112dfa1 100644
--- a/thunar-volman/tvm-run.c
+++ b/thunar-volman/tvm-run.c
@@ -172,7 +172,7 @@ tvm_run_burn_software (TvmContext *context,
   if (!autoburn)
 {
   g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, 
-   _(Autoburning of blank CDs/DVDs is disabled));
+   _(Autoburning of blank CDs and DVDs is disabled));
   return FALSE;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Implement photo import from cameras detected as mass storage devices.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to a75667cca11293e4f6582ac219f32b92cfbb9462 (commit)
   from d7fb1ad549e9b090b03ccfde1df46771c4b7863c (commit)

commit a75667cca11293e4f6582ac219f32b92cfbb9462
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 13:55:54 2010 +0200

Implement photo import from cameras detected as mass storage devices.

 thunar-volman/tvm-block-device.c |   77 +++--
 1 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 81cffb2..dfe570b 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -53,6 +53,9 @@ typedef gboolean (*TvmBlockDeviceHandler) (TvmContext 
*context,
 static gboolean tvm_file_test   (GMount  *mount,
  const gchar *filename,
  GFileTesttest);
+static gboolean tvm_block_device_autophoto  (TvmContext  *context,
+ GMount  *mount,
+ GError **error);
 static gboolean tvm_block_device_autorun(TvmContext  *context,
  GMount  *mount,
  GError **error);
@@ -66,8 +69,8 @@ static TvmBlockDeviceHandler block_device_handlers[] =
 {
 #if 0
   tvm_block_device_autoipod,
-  tvm_block_device_autophoto,
 #endif
+  tvm_block_device_autophoto,
   tvm_block_device_autorun,
   tvm_block_device_autobrowse,
 };
@@ -126,6 +129,61 @@ tvm_file_test (GMount  *mount,
 
 
 static gboolean
+tvm_block_device_autophoto (TvmContext *context,
+GMount *mount,
+GError**error)
+{
+  gboolean autophoto;
+  gboolean result = FALSE;
+  gchar   *autophoto_command;
+  gint response;
+
+  g_return_val_if_fail (context != NULL, FALSE);
+  g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  /* check if autophoto support is enabled */
+  autophoto = xfconf_channel_get_bool (context-channel, /autophoto/enabled, 
FALSE);
+  if (autophoto)
+{
+  autophoto_command = xfconf_channel_get_string (context-channel, 
+ /autophoto/command, 
NULL);
+  if (autophoto_command != NULL  *autophoto_command != '\0')
+{
+  /* check if we have any photos on the volume */
+  if (tvm_file_test (mount, dcim, G_FILE_TEST_IS_DIR))
+{
+  /* ask the user to import photos */
+  response = tvm_prompt (context, camera-photo, _(Photo 
Import),
+ _(A photo card has been detected),
+ _(There are photos on the card. Would 
you like to 
+   add these photos to your album?),
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(Import _Photos), TVM_RESPONSE_PHOTOS,
+ NULL);
+
+  if (response == TVM_RESPONSE_PHOTOS)
+{
+  /* run the preferred photo application */
+  result = tvm_run_command (context, mount, autophoto_command, 
error);
+}
+  else
+{
+  /* pretend that we handled the device */
+  result = TRUE;
+}
+}
+}
+  
+  g_free (autophoto_command);
+}
+
+  return result;
+}
+
+
+
+static gboolean
 tvm_block_device_autorun (TvmContext *context,
   GMount *mount,
   GError**error)
@@ -221,12 +279,15 @@ tvm_block_device_autorun (TvmContext *context,
 
   /* try to launch the autorun file */
   result = g_spawn_async (mount_path, argv, NULL, 0, NULL, 
NULL, NULL,
-  error);
+  err);
   
   /* free strings */
   g_strfreev (argv);
   g_free (mount_path);
 
+  if (err != NULL)
+g_propagate_error (error, err);
+
   return result;
 }
 }
@@ -266,7 +327,7 @@ tvm_block_device_autorun (TvmContext *context,
 
   /* try to launch the autorun file */
   result = g_spawn_async (mount_path, argv, NULL, 0, NULL, 
NULL, NULL,
-  error);
+  err);
   
   /* free strings */
   g_strfreev (argv);
@@ -275,6 +336,9 @@ tvm_block_device_autorun (TvmContext *context,
   /* free 

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add support for wacom volito and bamboo tablets.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 0a3fd067c0dd3e97382faa8d6429bc6d0300a665 (commit)
   from 916ddd8e49cba6cd4912b3efa01f7945718eb33b (commit)

commit 0a3fd067c0dd3e97382faa8d6429bc6d0300a665
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 11:11:43 2010 +0200

Add support for wacom volito and bamboo tablets.

 thunar-volman/tvm-input-device.c |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/thunar-volman/tvm-input-device.c b/thunar-volman/tvm-input-device.c
index bae1e7c..3be0721 100644
--- a/thunar-volman/tvm-input-device.c
+++ b/thunar-volman/tvm-input-device.c
@@ -38,6 +38,7 @@ tvm_input_device_added (TvmContext *context)
 {
   const gchar *id_class;
   const gchar *id_model;
+  const gchar *id_usb_driver;
   const gchar *driver;
   const gchar *enabled_property = NULL;
   const gchar *command_property = NULL;
@@ -50,6 +51,7 @@ tvm_input_device_added (TvmContext *context)
   id_class = g_udev_device_get_property (context-device, ID_CLASS);
   id_model = g_udev_device_get_property (context-device, ID_MODEL);
   driver = g_udev_device_get_property (context-device, DRIVER);
+  id_usb_driver = g_udev_device_get_property (context-device, 
ID_USB_DRIVER);
 
   if (g_strcmp0 (id_class, kbd) == 0)
 {
@@ -57,7 +59,8 @@ tvm_input_device_added (TvmContext *context)
   enabled_property = /autokeyboard/enabled;
   command_property = /autokeyboard/command;
 }
-  else if (g_strcmp0 (driver, wacom) == 0)
+  else if (g_strcmp0 (driver, wacom) == 0 
+   || g_strcmp0 (id_usb_driver, wacom) == 0)
 {
   /* we have a wacom tablet */
   enabled_property = /autotablet/enabled;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add support for detecting USB printers.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to ab265b25f13f70b35f3a2ceb2538053507af1883 (commit)
   from 0a3fd067c0dd3e97382faa8d6429bc6d0300a665 (commit)

commit ab265b25f13f70b35f3a2ceb2538053507af1883
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 11:12:11 2010 +0200

Add support for detecting USB printers.

 thunar-volman/Makefile.am  |4 +-
 thunar-volman/tvm-device.c |2 +
 .../{tvm-input-device.c = tvm-usb-device.c}   |   47 +++
 .../{tvm-block-device.h = tvm-usb-device.h}   |8 ++--
 4 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/thunar-volman/Makefile.am b/thunar-volman/Makefile.am
index 9d9153d..7e73183 100644
--- a/thunar-volman/Makefile.am
+++ b/thunar-volman/Makefile.am
@@ -47,7 +47,9 @@ thunar_volman_SOURCES =   
\
tvm-prompt.c\
tvm-prompt.h\
tvm-run.c   \
-   tvm-run.h
+   tvm-run.h   \
+   tvm-usb-device.c\
+   tvm-usb-device.h
 
 thunar_volman_CFLAGS = \
$(DBUS_CFLAGS)  \
diff --git a/thunar-volman/tvm-device.c b/thunar-volman/tvm-device.c
index 4da3aae..7249769 100644
--- a/thunar-volman/tvm-device.c
+++ b/thunar-volman/tvm-device.c
@@ -34,6 +34,7 @@
 #include thunar-volman/tvm-context.h
 #include thunar-volman/tvm-device.h
 #include thunar-volman/tvm-input-device.h
+#include thunar-volman/tvm-usb-device.h
 
 
 
@@ -57,6 +58,7 @@ static TvmDeviceHandler subsystem_handlers[] =
 {
   { block,   tvm_block_device_added },
   { input,   tvm_input_device_added },
+  { usb, tvm_usb_device_added   },
 #if 0
   { sound,   tvm_sound_device_added },
   { video4linux, tvm_video_device_added },
diff --git a/thunar-volman/tvm-input-device.c b/thunar-volman/tvm-usb-device.c
similarity index 57%
copy from thunar-volman/tvm-input-device.c
copy to thunar-volman/tvm-usb-device.c
index 3be0721..8db2c2c 100644
--- a/thunar-volman/tvm-input-device.c
+++ b/thunar-volman/tvm-usb-device.c
@@ -26,19 +26,16 @@
 
 #include libxfce4util/libxfce4util.h
 
-#include thunar-volman/tvm-input-device.h
 #include thunar-volman/tvm-context.h
 #include thunar-volman/tvm-device.h
 #include thunar-volman/tvm-run.h
+#include thunar-volman/tvm-usb-device.h
 
 
 
 void
-tvm_input_device_added (TvmContext *context)
+tvm_usb_device_added (TvmContext *context)
 {
-  const gchar *id_class;
-  const gchar *id_model;
-  const gchar *id_usb_driver;
   const gchar *driver;
   const gchar *enabled_property = NULL;
   const gchar *command_property = NULL;
@@ -48,46 +45,18 @@ tvm_input_device_added (TvmContext *context)
   g_return_if_fail (context != NULL);
 
   /* collect device information */
-  id_class = g_udev_device_get_property (context-device, ID_CLASS);
-  id_model = g_udev_device_get_property (context-device, ID_MODEL);
   driver = g_udev_device_get_property (context-device, DRIVER);
-  id_usb_driver = g_udev_device_get_property (context-device, 
ID_USB_DRIVER);
 
-  if (g_strcmp0 (id_class, kbd) == 0)
+  if (g_strcmp0 (driver, usblp) == 0)
 {
-  /* we have a keyboard */
-  enabled_property = /autokeyboard/enabled;
-  command_property = /autokeyboard/command;
-}
-  else if (g_strcmp0 (driver, wacom) == 0 
-   || g_strcmp0 (id_usb_driver, wacom) == 0)
-{
-  /* we have a wacom tablet */
-  enabled_property = /autotablet/enabled;
-  command_property = /autotabled/command;
-}
-  else if (g_strcmp0 (id_class, mouse) == 0)
-{
-  if (g_strstr_len (id_model, -1, Tablet) != NULL 
-  || g_strstr_len (id_model, -1, TABLET) != NULL
-  || g_strstr_len (id_model, -1, tablet) != NULL)
-{
-  /* we have a tablet that can be used as a mouse */
-  enabled_property = /autotablet/enabled;
-  command_property = /autotablet/command;
-}
-  else
-{
-  /* we have a normal mouse */
-  enabled_property = /automouse/enabled;
-  command_property = /automouse/command;
-}
+  enabled_property = /autoprinter/enabled;
+  command_property = /autoprinter/command;
 }
 
   /* check if we have a device that we support */
   if (enabled_property != NULL  command_property != NULL)
 {
-  /* check whether handling the keyboard/tablet/mouse is enabled */
+  /* check whether handling the printer or whatever is enabled */
   enabled = xfconf_channel_get_bool (context-channel, enabled_property, 
FALSE);
   if (enabled)
 {
@@ -102,9 +71,9 @@ tvm_input_device_added (TvmContext *context)
 }
   

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add function to run the default audio CD player.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 8761d7e17778886a60ce96dd6d736d5b9b0c147f (commit)
   from 1e50062cee660551c1c2759baf00dfd8aecc07f3 (commit)

commit 8761d7e17778886a60ce96dd6d736d5b9b0c147f
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 12:25:46 2010 +0200

Add function to run the default audio CD player.

 thunar-volman/tvm-run.c |   42 +++---
 thunar-volman/tvm-run.h |2 ++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/thunar-volman/tvm-run.c b/thunar-volman/tvm-run.c
index 112dfa1..a4bc67b 100644
--- a/thunar-volman/tvm-run.c
+++ b/thunar-volman/tvm-run.c
@@ -155,7 +155,6 @@ tvm_run_burn_software (TvmContext *context,
 ID_CDROM_MEDIA_DVD_PLUS_R,
 ID_CDROM_MEDIA_DVD_PLUS_RW,
   };
-  gbooleanautoburn;
   gbooleanis_cd = FALSE;
   gbooleanis_dvd = FALSE;
   gbooleanresult = FALSE;
@@ -168,8 +167,7 @@ tvm_run_burn_software (TvmContext *context,
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
   /* abort without error if autoburning is turned off */
-  autoburn = xfconf_channel_get_bool (context-channel, /autoburn/enabled, 
FALSE);
-  if (!autoburn)
+  if (!xfconf_channel_get_bool (context-channel, /autoburn/enabled, FALSE))
 {
   g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, 
_(Autoburning of blank CDs and DVDs is disabled));
@@ -242,3 +240,41 @@ tvm_run_burn_software (TvmContext *context,
   return result;
 }
 
+
+
+gboolean 
+tvm_run_cd_player (TvmContext *context,
+   GError**error)
+{
+  gboolean result = FALSE;
+  gchar   *command;
+
+  g_return_val_if_fail (context != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  /* check whether autoplaying audio CDs is enabled */
+  if (xfconf_channel_get_bool (context-channel, 
/autoplay-audio-cds/enabled, FALSE))
+{
+  /* determine the audio CD player command */
+  command = xfconf_channel_get_string (context-channel, 
+   /autoplay-audio-cds/command, 
NULL);
+
+  /* check whether the command is set and non-empty */
+  if (command != NULL  *command != '\0')
+{
+  /* try to lanuch the audio CD player */
+  result = tvm_run_command (context, NULL, command, error);
+}
+  else
+{
+  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+   _(The CD player command is undefined));
+}
+  
+  /* free the command string */
+  g_free (command);
+}
+
+  return result;
+}
diff --git a/thunar-volman/tvm-run.h b/thunar-volman/tvm-run.h
index dc67d13..c3b472a 100644
--- a/thunar-volman/tvm-run.h
+++ b/thunar-volman/tvm-run.h
@@ -33,6 +33,8 @@ gboolean tvm_run_command(TvmContext  *context,
  GError **error);
 gboolean  tvm_run_burn_software (TvmContext  *context,
  GError **error);
+gboolean  tvm_run_cd_player (TvmContext  *context,
+ GError **error);
 
 G_END_DECLS
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Make the PDA tab available agian. Disabled because unsupported.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 8dfedf486e21d592409fdd2db52e38a1057a4317 (commit)
   from 4c8e7f24119632852d1ab381129cdaa1e0347d56 (commit)

commit 8dfedf486e21d592409fdd2db52e38a1057a4317
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 13:57:13 2010 +0200

Make the PDA tab available agian. Disabled because unsupported.

 thunar-volman-settings/tvm-preferences-dialog.c |   90 +++
 1 files changed, 90 insertions(+), 0 deletions(-)

diff --git a/thunar-volman-settings/tvm-preferences-dialog.c 
b/thunar-volman-settings/tvm-preferences-dialog.c
index 0e6bfcf..8389f73 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -420,6 +420,96 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, 
 GTK_FILL, 0, 0);
   gtk_widget_show (entry);
+
+  /*
+ PDAs
+   */
+  label = gtk_label_new (_(PDAs));
+  vbox = g_object_new (GTK_TYPE_VBOX, border-width, 12, spacing, 12, NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (label);
+  gtk_widget_show (vbox);
+
+  /* FIXME make the vbox sensitive again as soon as there is PDA support */
+  gtk_widget_set_sensitive (vbox, FALSE);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Palm™));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (palm-pilot, GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Sync _Palm™ devices 
+ when connected));
+  xfconf_g_property_bind (channel, /autopalm/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(_Command:));
+  xfconf_g_property_bind (channel, /autopalm/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autopalm/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (entry);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Pocket PCs));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (tvm-dev-pocketpc, 
GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Sync Pocket P_C devices 
+ when connected));
+  xfconf_g_property_bind (channel, /autopocketpc/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(C_ommand:));
+  xfconf_g_property_bind (channel, /autopocketpc/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autopocketpc/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
+GTK_FILL, 0, 0);
+  

[Xfce4-commits] thunar-volman:jannis/port-to-udev Initial work on porting thunar-volman-settings to the new code.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 344b273424f3e49fdedeb677db48db8fdaebf67c (commit)
   from 11b47a673e22f3b9e7715548b5f5ca1a8ee8ba2a (commit)

commit 344b273424f3e49fdedeb677db48db8fdaebf67c
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 13:41:29 2010 +0200

Initial work on porting thunar-volman-settings to the new code.

The storage devices tab already works again.

 .gitignore |1 -
 Makefile.am|   30 +--
 configure.in.in|2 +
 thunar-volman-settings.in  |7 -
 .../Makefile.am|   64 ++--
 thunar-volman-settings/main.c  |   88 
 .../thunar-volman-settings.desktop.in.in   |0
 thunar-volman-settings/tvm-command-entry.c |  418 
 thunar-volman-settings/tvm-command-entry.h |   62 +++
 thunar-volman-settings/tvm-preferences-dialog.c|  325 +++
 thunar-volman-settings/tvm-preferences-dialog.h|   46 +++
 thunar-volman/Makefile.am  |2 -
 12 files changed, 975 insertions(+), 70 deletions(-)

diff --git a/.gitignore b/.gitignore
index 53a839c..e35c136 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,5 @@ mkinstalldirs
 POTFILES
 stamp-it
 stamp-h1
-thunar-volman-settings
 thunar-volman-settings.desktop
 texput.log
diff --git a/Makefile.am b/Makefile.am
index 47b4284..14481ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,8 @@
 SUBDIRS =  \
icons   \
po  \
-   thunar-volman
+   thunar-volman   \
+   thunar-volman-settings
 
 distclean-local:
rm -rf *.spec *.cache *~
@@ -12,38 +13,15 @@ rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
 
-libexec_SCRIPTS =  \
-   thunar-volman-settings
-
-thunar-volman-settings: thunar-volman-settings.in Makefile
-   rm -f thunar-volman-settings.gen thunar-volman-settings
-   sed -e s,\...@bindir\@,$(bindir),g\
-$(srcdir)/thunar-volman-settings.in   \
-thunar-volman-settings.gen
-   mv thunar-volman-settings.gen thunar-volman-settings
-
-desktopdir = $(datadir)/applications
-desktop_in_in_files = thunar-volman-settings.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
-   sed -e s,\...@libexecdir\@,$(libexecdir),g  $  $@
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-...@intltool_desktop_rule@
-
 EXTRA_DIST =   \
THANKS  \
intltool-extract.in \
intltool-merge.in   \
-   intltool-update.in  \
-   thunar-volman-settings.in   \
-   $(desktop_in_in_files)
+   intltool-update.in
 
 DISTCLEANFILES =   \
intltool-extract\
intltool-merge  \
-   intltool-update \
-   thunar-volman-settings  \
-   $(desktop_in_files) \
-   $(desktop_DATA)
+   intltool-update
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/configure.in.in b/configure.in.in
index 1a40559..89ba231 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -81,6 +81,7 @@ dnl ***
 dnl *** Check for required packages ***
 dnl ***
 XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.34])
+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0])
@@ -120,6 +121,7 @@ icons/48x48/Makefile
 icons/scalable/Makefile
 po/Makefile.in
 thunar-volman/Makefile
+thunar-volman-settings/Makefile
 ])
 
 dnl ***
diff --git a/thunar-volman-settings.in b/thunar-volman-settings.in
deleted file mode 100644
index c78d09e..000
--- a/thunar-volman-settings.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2007 Benedikt Meurer be...@xfce.org
-#
-
-# launch the thunar-volman preferences
-exec 

[Xfce4-commits] thunar-volman:jannis/port-to-udev Make the printers page available again.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 24890c59eb95b8488e0cacdc43ead2c13fec9523 (commit)
   from 8dfedf486e21d592409fdd2db52e38a1057a4317 (commit)

commit 24890c59eb95b8488e0cacdc43ead2c13fec9523
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 13:59:18 2010 +0200

Make the printers page available again.

 thunar-volman-settings/tvm-preferences-dialog.c |   48 +++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/thunar-volman-settings/tvm-preferences-dialog.c 
b/thunar-volman-settings/tvm-preferences-dialog.c
index 8389f73..f52a550 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -510,6 +510,54 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
 GTK_FILL, 0, 0);
   gtk_widget_show (entry);
+
+  /*
+ Printers
+   */
+  label = gtk_label_new (_(Printers));
+  vbox = g_object_new (GTK_TYPE_VBOX, border-width, 12, spacing, 12, NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (label);
+  gtk_widget_show (vbox);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Printers));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (gnome-dev-printer, 
GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Automatically run a program 
+ when a _printer is 
connected));
+  xfconf_g_property_bind (channel, /autoprinter/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(_Command:));
+  xfconf_g_property_bind (channel, /autoprinter/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autoprinter/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
+GTK_FILL, 0, 0);
+  gtk_widget_show (entry);
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add support for detecting PTP/gphoto2 cameras.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 1a6787121c8fe4cb15f87b6be066d07721aee66f (commit)
   from ab265b25f13f70b35f3a2ceb2538053507af1883 (commit)

commit 1a6787121c8fe4cb15f87b6be066d07721aee66f
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 11:29:21 2010 +0200

Add support for detecting PTP/gphoto2 cameras.

 thunar-volman/tvm-usb-device.c |9 -
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/thunar-volman/tvm-usb-device.c b/thunar-volman/tvm-usb-device.c
index 8db2c2c..943f362 100644
--- a/thunar-volman/tvm-usb-device.c
+++ b/thunar-volman/tvm-usb-device.c
@@ -40,14 +40,21 @@ tvm_usb_device_added (TvmContext *context)
   const gchar *enabled_property = NULL;
   const gchar *command_property = NULL;
   gboolean enabled;
+  gboolean is_camera;
   gchar   *command;
 
   g_return_if_fail (context != NULL);
 
   /* collect device information */
   driver = g_udev_device_get_property (context-device, DRIVER);
+  is_camera = g_udev_device_get_property_as_boolean (context-device, 
ID_GPHOTO2);
 
-  if (g_strcmp0 (driver, usblp) == 0)
+  if (is_camera)
+{
+  enabled_property = /autophoto/enabled;
+  command_property = /autophoto/command;
+}
+  else if (g_strcmp0 (driver, usblp) == 0)
 {
   enabled_property = /autoprinter/enabled;
   command_property = /autoprinter/command;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Fix typo spotted by Linoel Le Folgoc.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 1e50062cee660551c1c2759baf00dfd8aecc07f3 (commit)
   from 1a6787121c8fe4cb15f87b6be066d07721aee66f (commit)

commit 1e50062cee660551c1c2759baf00dfd8aecc07f3
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 11:54:15 2010 +0200

Fix typo spotted by Linoel Le Folgoc.

 thunar-volman/tvm-input-device.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/thunar-volman/tvm-input-device.c b/thunar-volman/tvm-input-device.c
index 3be0721..2747be1 100644
--- a/thunar-volman/tvm-input-device.c
+++ b/thunar-volman/tvm-input-device.c
@@ -64,7 +64,7 @@ tvm_input_device_added (TvmContext *context)
 {
   /* we have a wacom tablet */
   enabled_property = /autotablet/enabled;
-  command_property = /autotabled/command;
+  command_property = /autotablet/command;
 }
   else if (g_strcmp0 (id_class, mouse) == 0)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add support for mixed data/audio and pure audio CDs.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 11b47a673e22f3b9e7715548b5f5ca1a8ee8ba2a (commit)
   from 8761d7e17778886a60ce96dd6d736d5b9b0c147f (commit)

commit 11b47a673e22f3b9e7715548b5f5ca1a8ee8ba2a
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 12:26:10 2010 +0200

Add support for mixed data/audio and pure audio CDs.

In addition, a few more calls to tvm_device_handler_finished() have been
added to make sure thunar-volman exits on unknown/unsupported devices
and on features that are disabled. A few checks have been added to only
do something if the corresponding feature is enabled.

 thunar-volman/tvm-block-device.c |  101 +++---
 1 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 268d41a..b586df1 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -707,8 +707,12 @@ tvm_block_device_added (TvmContext *context)
   gboolean is_cdrom;
   gboolean is_partition;
   gboolean is_volume;
+  gboolean automount;
+  gboolean autoplay;
   guint64  audio_tracks;
+  guint64  data_tracks;
   GError  *error = NULL;
+  gint response;
 
   g_return_if_fail (context != NULL);
 
@@ -731,6 +735,9 @@ tvm_block_device_added (TvmContext *context)
   /* collect CD information */
   media_state = g_udev_device_get_property (context-device, 
 ID_CDROM_MEDIA_STATE);
+  data_tracks =
+g_udev_device_get_property_as_uint64 (context-device,
+  
ID_CDROM_MEDIA_TRACK_COUNT_DATA);
   audio_tracks = 
 g_udev_device_get_property_as_uint64 (context-device, 
   
ID_CDROM_MEDIA_TRACK_COUNT_AUDIO);
@@ -745,17 +752,84 @@ tvm_block_device_added (TvmContext *context)
   /* finish processing the device */
   tvm_device_handler_finished (context);
 }
+  else if (audio_tracks  0  data_tracks  0)
+{
+  /* check if both autoplay and automounting of CDs/DVDs is 
enabled */
+  automount = xfconf_channel_get_bool (context-channel, 
+   /automount-media/enabled, 
FALSE);
+  autoplay = xfconf_channel_get_bool (context-channel, 
+  
/autoplay-audio-cds/enabled, FALSE);
+  if (automount  autoplay)
+{
+  /* ask what to do with the mixed audio/data disc */
+  response = tvm_prompt (context, gnome-dev-cdrom-audio,
+ _(Audio/Data CD),
+ _(The CD in the drive contains both 
music 
+   and files),
+ _(Would you like to listen to music 
or 
+   browse the files?),
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(_Browse Files), 
TVM_RESPONSE_BROWSE,
+ _(_Play CD), TVM_RESPONSE_PLAY, 
+ NULL);
+
+  switch (response)
+{
+case TVM_RESPONSE_PLAY:
+  goto autoplay_disc;
+  break;
+
+case TVM_RESPONSE_BROWSE:
+  goto automount_disc;
+  break;
+
+default:
+  /* finish processing the device */
+  tvm_device_handler_finished (context);
+  break;
+}
+}
+  else if (automount)
+{
+  /* just mount the disc automatically */
+  goto automount_disc;
+}
+  else if (autoplay)
+{
+  /* just play the disc automatically */
+  goto autoplay_disc;
+}
+  else
+{
+  /* finish processing the device */
+  tvm_device_handler_finished (context);
+}
+}
   else if (audio_tracks  0)
 {
-#if 0
-  /* TODO detect mixed CDs with audio AND data tracks */
-  tvm_run_cd_player (client, device, channel, error);
-#endif
+autoplay_disc:
+  /* open the audio CD in the favorite CD player */
+  tvm_run_cd_player (context, context-error);
+
+  /* finish processing the device */
+  tvm_device_handler_finished (context);
+}
+  else if (data_tracks  0)
+{

[Xfce4-commits] thunar-volman:jannis/port-to-udev Fix path to the thunar-volman-settings executable.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 45335a4707272417b3c5fbb28ffe3dd6f4926d1d (commit)
   from 693abb789907d8548ce22bbc8629e3ece1cd8f39 (commit)

commit 45335a4707272417b3c5fbb28ffe3dd6f4926d1d
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 14:36:49 2010 +0200

Fix path to the thunar-volman-settings executable.

 .../thunar-volman-settings.desktop.in.in   |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/thunar-volman-settings/thunar-volman-settings.desktop.in.in 
b/thunar-volman-settings/thunar-volman-settings.desktop.in.in
index b82fb13..46d3b1b 100644
--- a/thunar-volman-settings/thunar-volman-settings.desktop.in.in
+++ b/thunar-volman-settings/thunar-volman-settings.desktop.in.in
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 _Name=Removable Drives and Media
 _Comment=Configure management of removable drives and media
-ex...@libexecdir@/thunar-volman-settings
+Exec=thunar-volman-settings
 Icon=gnome-dev-removable
 Terminal=false
 StartupNotify=true
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Make the input devices tab available again.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 3407dce340a7860de244ce2c1957f346482a1b80 (commit)
   from 24890c59eb95b8488e0cacdc43ead2c13fec9523 (commit)

commit 3407dce340a7860de244ce2c1957f346482a1b80
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 14:07:36 2010 +0200

Make the input devices tab available again.

Except for PDA (Palm, PocketPC) support everything is more or less
complete now.

 thunar-volman-settings/tvm-preferences-dialog.c |  126 +++
 1 files changed, 126 insertions(+), 0 deletions(-)

diff --git a/thunar-volman-settings/tvm-preferences-dialog.c 
b/thunar-volman-settings/tvm-preferences-dialog.c
index f52a550..13772e8 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -558,6 +558,132 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
 GTK_FILL, 0, 0);
   gtk_widget_show (entry);
+
+  /*
+ Input Devices
+   */
+  label = gtk_label_new (_(Input Devices));
+  vbox = g_object_new (GTK_TYPE_VBOX, border-width, 12, spacing, 12, NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (label);
+  gtk_widget_show (vbox);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Keyboards));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (gnome-dev-keyboard, 
GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Automatically run a program 
+ when an USB _keyboard is 
connected));
+  xfconf_g_property_bind (channel, /autokeyboard/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(_Command:));
+  xfconf_g_property_bind (channel, /autokeyboard/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autokeyboard/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
+GTK_FILL, 0, 0);
+  gtk_widget_show (entry);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Mice));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (gnome-dev-mouse-optical, 
GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Automatically run a program 
+ when an USB _mouse is 
connected));
+  xfconf_g_property_bind (channel, /automouse/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL,
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(C_ommand:));
+  xfconf_g_property_bind (channel, /automouse/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /automouse/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
+   

[Xfce4-commits] thunar-volman:jannis/port-to-udev Implement the multimedia tab of thunar-volman-settings again.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 2629d51bd957ed1bb9c3e0ab39582b5dacdf72c2 (commit)
   from 344b273424f3e49fdedeb677db48db8fdaebf67c (commit)

commit 2629d51bd957ed1bb9c3e0ab39582b5dacdf72c2
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 13:48:24 2010 +0200

Implement the multimedia tab of thunar-volman-settings again.

 thunar-volman-settings/tvm-preferences-dialog.c |  158 +--
 1 files changed, 146 insertions(+), 12 deletions(-)

diff --git a/thunar-volman-settings/tvm-preferences-dialog.c 
b/thunar-volman-settings/tvm-preferences-dialog.c
index 89acc75..b8a8546 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -186,12 +186,15 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
 GTK_FILL, 0, 0);
   gtk_widget_show (button);
 
-  button = gtk_check_button_new_with_mnemonic (_(Auto-open files on new 
drives and media));
+  button = gtk_check_button_new_with_mnemonic (_(Auto-open files on new 
drives 
+ and media));
   xfconf_g_property_bind (channel, /autoopen/enabled, G_TYPE_BOOLEAN, 
button, active);
-  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 4, 5, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 4, 5, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_widget_show (button);
 
-  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
GTK_SHADOW_NONE, NULL);
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
   gtk_widget_show (frame);
 
@@ -212,30 +215,161 @@ tvm_preferences_dialog_init (TvmPreferencesDialog 
*dialog)
   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
   gtk_widget_show (image);
 
-  button = gtk_check_button_new_with_mnemonic (_(_Burn a CD or DVD when a 
blank disc is inserted));
-  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, 
button, active);
-  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  button = gtk_check_button_new_with_mnemonic (_(_Burn a CD or DVD when a 
blank disc 
+ is inserted));
+  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_widget_show (button);
 
   /* use a size group to make sure both labels request the same width */
   size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
   entry = tvm_command_entry_new_with_label (_(Command for _Data CDs:));
-  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, entry, 
sensitive);
-  xfconf_g_property_bind (channel, /autoburn/data-cd-command, G_TYPE_STRING, 
entry, command);
-  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autoburn/data-cd-command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_size_group_add_widget (size_group, TVM_COMMAND_ENTRY (entry)-label);
   gtk_widget_show (entry);
 
   entry = tvm_command_entry_new_with_label (_(Command for A_udio CDs:));
-  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, entry, 
sensitive);
-  xfconf_g_property_bind (channel, /autoburn/audio-cd-command, 
G_TYPE_STRING, entry, command);
-  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autoburn/audio-cd-command, 
G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_size_group_add_widget (size_group, TVM_COMMAND_ENTRY (entry)-label);
   gtk_widget_show (entry);
 
   /* release the size group */
   g_object_unref (G_OBJECT (size_group));
+
+  /*
+ Multimedia
+   */
+  label = gtk_label_new (_(Multimedia));
+  vbox = g_object_new (GTK_TYPE_VBOX, border-width, 12, spacing, 12, NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (label);
+  gtk_widget_show (vbox);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add missing compiler and linker flags for gthread.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 42276b42a38c551ede3986c37f67ffafb143e7f8 (commit)
   from ec4a642dac6bdf799b868daa41a4c9c43aa2adb4 (commit)

commit 42276b42a38c551ede3986c37f67ffafb143e7f8
Author: Jannis Pohlmann jan...@xfce.org
Date:   Fri Jul 23 10:03:12 2010 +0200

Add missing compiler and linker flags for gthread.

 thunar-volman-settings/Makefile.am |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/thunar-volman-settings/Makefile.am 
b/thunar-volman-settings/Makefile.am
index 296e0e7..4b97bf9 100644
--- a/thunar-volman-settings/Makefile.am
+++ b/thunar-volman-settings/Makefile.am
@@ -41,6 +41,7 @@ thunar_volman_settings_SOURCES =  
\
 thunar_volman_settings_CFLAGS =
\
$(EXO_CFLAGS)   \
$(GLIB_CFLAGS)  \
+   $(GTHREAD_CFLAGS)   \
$(GTK_CFLAGS)   \
$(LIBXFCE4UI_CFLAGS)\
$(LIBXFCE4UTIL_CFLAGS)  \
@@ -54,6 +55,7 @@ thunar_volman_settings_LDFLAGS =  
\
 thunar_volman_settings_LDADD = \
$(EXO_LIBS) \
$(GLIB_LIBS)\
+   $(GTHREAD_LIBS) \
$(GTK_LIBS) \
$(LIBXFCE4UI_LIBS)  \
$(LIBXFCE4UTIL_LIBS)\
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Make the camera tab available again.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 4c8e7f24119632852d1ab381129cdaa1e0347d56 (commit)
   from 2629d51bd957ed1bb9c3e0ab39582b5dacdf72c2 (commit)

commit 4c8e7f24119632852d1ab381129cdaa1e0347d56
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 13:53:21 2010 +0200

Make the camera tab available again.

 thunar-volman-settings/tvm-preferences-dialog.c |   54 ++-
 1 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/thunar-volman-settings/tvm-preferences-dialog.c 
b/thunar-volman-settings/tvm-preferences-dialog.c
index b8a8546..0e6bfcf 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -360,7 +360,8 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   button = gtk_check_button_new_with_mnemonic (_(Play _music files when 
connected));
   xfconf_g_property_bind (channel, /autoipod/enabled, G_TYPE_BOOLEAN, 
   button, active);
-  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_widget_show (button);
 
   entry = tvm_command_entry_new_with_label (_(C_ommand:));
@@ -368,7 +369,56 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   entry, sensitive);
   xfconf_g_property_bind (channel, /autoipod/command, G_TYPE_STRING, 
   entry, command);
-  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (entry);
+
+  /*
+ Cameras
+   */
+  label = gtk_label_new (_(Cameras));
+  vbox = g_object_new (GTK_TYPE_VBOX, border-width, 12, spacing, 12, NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (label);
+  gtk_widget_show (vbox);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Digital Cameras));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (camera-photo, GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Import digital photographs 
+ when connected));
+  xfconf_g_property_bind (channel, /autophoto/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(_Command:));
+  xfconf_g_property_bind (channel, /autophoto/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autophoto/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_widget_show (entry);
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Display detection and mount notifications if libnotify is available.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to ec4a642dac6bdf799b868daa41a4c9c43aa2adb4 (commit)
   from e6833035f20332b23e4e76f3eb96117680628bb8 (commit)

commit ec4a642dac6bdf799b868daa41a4c9c43aa2adb4
Author: Jannis Pohlmann jan...@xfce.org
Date:   Thu Jul 22 13:47:49 2010 +0200

Display detection and mount notifications if libnotify is available.

 configure.in.in|   13 +++-
 thunar-volman/Makefile.am  |   11 +++-
 thunar-volman/main.c   |   23 ++
 thunar-volman/tvm-block-device.c   |   62 ++-
 thunar-volman/tvm-input-device.c   |   23 ++
 thunar-volman/tvm-notify.c |   83 
 thunar-volman/{tvm-input-device.h = tvm-notify.h} |   16 ++--
 thunar-volman/tvm-usb-device.c |   15 
 8 files changed, 234 insertions(+), 12 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 89ba231..2189714 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -91,6 +91,12 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0])
 
+dnl ***
+dnl *** Optional mount notification support (libnotify) ***
+dnl ***
+XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.4.0], [notifications], 
+   [Notifications support], [yes])
+
 dnl ***
 dnl *** Check for debugging support ***
 dnl ***
@@ -130,5 +136,10 @@ dnl ***
 echo
 echo Build Configuration:
 echo
-echo * Debug Support: $enable_debug
+if test x$LIBNOTIFY_FOUND = xyes; then
+echo * Mount notifications: yes
+else
+echo * Mount notifications: no
+fi
+echo * Debug Support:   $enable_debug
 echo
diff --git a/thunar-volman/Makefile.am b/thunar-volman/Makefile.am
index e64b656..4e9b00b 100644
--- a/thunar-volman/Makefile.am
+++ b/thunar-volman/Makefile.am
@@ -28,6 +28,12 @@ INCLUDES =   
\
 bin_PROGRAMS = \
thunar-volman
 
+if HAVE_LIBNOTIFY
+tvm_notify_sources =   \
+   tvm-notify.c\
+   tvm-notify.h
+endif
+
 thunar_volman_SOURCES =
\
main.c  \
tvm-block-device.c  \
@@ -47,7 +53,8 @@ thunar_volman_SOURCES =   
\
tvm-run.c   \
tvm-run.h   \
tvm-usb-device.c\
-   tvm-usb-device.h
+   tvm-usb-device.h\
+   $(tvm_notify_sources)
 
 thunar_volman_CFLAGS = \
$(DBUS_CFLAGS)  \
@@ -56,6 +63,7 @@ thunar_volman_CFLAGS =
\
$(GTHREAD_CFLAGS)   \
$(GTK_CFLAGS)   \
$(GUDEV_CFLAGS) \
+   $(LIBNOTIFY_CFLAGS) \
$(LIBXFCE4UI_CFLAGS)\
$(LIBXFCE4UTIL_CFLAGS)  \
$(XFCONF_CFLAGS)\
@@ -72,6 +80,7 @@ thunar_volman_LDADD = 
\
$(GTHREAD_LIBS) \
$(GTK_LIBS) \
$(GUDEV_LIBS)   \
+   $(LIBNOTIFY_LIBS)   \
$(LIBXFCE4UI_LIBS)  \
$(LIBXFCE4UTIL_LIBS)\
$(XFCONF_LIBS)
diff --git a/thunar-volman/main.c b/thunar-volman/main.c
index 2943c88..b502059 100644
--- a/thunar-volman/main.c
+++ b/thunar-volman/main.c
@@ -33,6 +33,10 @@
 
 #include gudev/gudev.h
 
+#ifdef HAVE_LIBNOTIFY
+#include libnotify/notify.h
+#endif
+
 #include libxfce4util/libxfce4util.h
 
 #include xfconf/xfconf.h
@@ -97,6 +101,20 @@ main (intargc,
   if (!g_thread_supported ())
 g_thread_init 

[Xfce4-commits] thunar-volman:master Implement video CD/DVD autoplaying.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 4fee95888fe46deab053be73b121323467168ede (commit)
   from 86b67e880310d214507a29c2a0e98a751a120c91 (commit)

commit 4fee95888fe46deab053be73b121323467168ede
Author: Jannis Pohlmann jan...@xfce.org
Date:   Mon Jul 19 19:22:17 2010 +0200

Implement video CD/DVD autoplaying.

 .gitignore   |1 -
 thunar-volman/tvm-block-device.c |   92 +++---
 2 files changed, 86 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 689645c..53a839c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,4 +37,3 @@ stamp-h1
 thunar-volman-settings
 thunar-volman-settings.desktop
 texput.log
-thunar-volman
diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 26c9483..118e383 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -44,9 +44,15 @@ typedef gboolean (*TvmBlockDeviceHandler) (TvmContext 
*context,
 
 
 
-static gboolean tvm_block_device_autobrowse (TvmContext *context,
- GMount *mount,
- GError**error);
+static gboolean tvm_file_test   (GMount  *mount,
+ const gchar *filename,
+ GFileTesttest);
+static gboolean tvm_block_device_autorun(TvmContext  *context,
+ GMount  *mount,
+ GError **error);
+static gboolean tvm_block_device_autobrowse (TvmContext  *context,
+ GMount  *mount,
+ GError **error);
 
 
 
@@ -55,14 +61,90 @@ static TvmBlockDeviceHandler block_device_handlers[] =
 #if 0
   tvm_block_device_autoipod,
   tvm_block_device_autophoto,
-  tvm_block_device_autorun,
 #endif
+  tvm_block_device_autorun,
   tvm_block_device_autobrowse,
 };
 
 
 
 static gboolean
+tvm_file_test (GMount  *mount,
+   const gchar *filename,
+   GFileTesttest)
+{
+  gboolean result = FALSE;
+  GFile   *mount_point;
+  gchar   *mount_path;
+  gchar   *absolute_path;
+
+  g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
+  g_return_val_if_fail (filename != NULL  *filename != '\0', FALSE);
+
+  mount_point = g_mount_get_root (mount);
+  mount_path = g_file_get_path (mount_point);
+  g_object_unref (mount_point);
+
+  absolute_path = g_build_filename (mount_path, filename, NULL);
+  g_free (mount_path);
+
+  result = g_file_test (absolute_path, test);
+  g_free (absolute_path);
+
+  return result;
+}
+
+
+
+static gboolean
+tvm_block_device_autorun (TvmContext *context,
+  GMount *mount,
+  GError**error)
+{
+  gboolean autoplay;
+  gboolean result = FALSE;
+  GError  *err = NULL;
+  gchar   *autoplay_command;
+
+  g_return_val_if_fail (context != NULL, FALSE);
+  g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  /* check if autoplaying video CDs and DVDs is enabled */
+  autoplay = xfconf_channel_get_bool (context-channel, 
+  /autoplay-video-cds/enabled, FALSE);
+  if (autoplay)
+{
+  /* check if we have a video CD or video DVD here */
+  if (tvm_file_test (mount, vcd, G_FILE_TEST_IS_DIR) 
+  || tvm_file_test (mount, video_ts, G_FILE_TEST_IS_DIR))
+{
+  /* determine the autoplay command for video CDs/DVDs */
+  autoplay_command = xfconf_channel_get_string (context-channel,
+
/autoplay-video-cds/command, 
+parole);
+
+  /* try to spawn the preferred video CD/DVD player */
+  result = tvm_run_command (context, mount, autoplay_command, err);
+
+  /* free the command string */
+  g_free (autoplay_command);
+
+  /* forward errors to the caller */
+  if (err != NULL)
+g_propagate_error (error, err);
+
+  /* return success/failure to the caller */
+  return result;
+}
+}
+
+  return TRUE;
+}
+
+
+
+static gboolean
 tvm_block_device_autobrowse (TvmContext *context,
  GMount *mount,
  GError**error)
@@ -128,8 +210,6 @@ tvm_block_device_mount_finish (GVolume  *volume,
   g_return_if_fail (G_IS_ASYNC_RESULT (result));
   g_return_if_fail (context != NULL);
 
-  g_debug (finish);
-
   /* finish mounting the volume */
   if (g_volume_mount_finish (volume, result, error))
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Implement autorun support (requires .autorun, autorun or autorun.sh).

[Jannis Pohlmann]

Updating branch refs/heads/master
 to fef3c1273d39bfb04c818d379d43db09a5c0323b (commit)
   from 269de460833d282df34812bbaffc7f8b0dbe67bf (commit)

commit fef3c1273d39bfb04c818d379d43db09a5c0323b
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 12:25:59 2010 +0200

Implement autorun support (requires .autorun, autorun or autorun.sh).

This is the first step towards support of the Desktop Application
Autostart Specification. The next step is autoopen support.

 thunar-volman/tvm-block-device.c |   61 +-
 thunar-volman/tvm-run.c  |2 +-
 2 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 42ed5f4..7c999e9 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -34,6 +34,7 @@
 #include thunar-volman/tvm-context.h
 #include thunar-volman/tvm-device.h
 #include thunar-volman/tvm-gio-extensions.h
+#include thunar-volman/tvm-prompt.h
 #include thunar-volman/tvm-run.h
 
 
@@ -125,9 +126,16 @@ tvm_block_device_autorun (TvmContext *context,
   GError**error)
 {
   gboolean autoplay;
+  gboolean autorun;
   gboolean result = FALSE;
   GError  *err = NULL;
+  GFile   *mount_point;
+  gchar  **argv;
   gchar   *autoplay_command;
+  gchar   *message;
+  gchar   *mount_path;
+  guintn;
+  gint response;
 
   g_return_val_if_fail (context != NULL, FALSE);
   g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
@@ -162,7 +170,58 @@ tvm_block_device_autorun (TvmContext *context,
 }
 }
 
-  return TRUE;
+  /* check if autorun is enabled */
+  autorun = xfconf_channel_get_bool (context-channel, /autorun/enabled, 
FALSE);
+  if (autorun)
+{
+  /* Autostart files according to the Desktop Application Autostart
+   * Specification */
+  static const gchar *autorun_files[] = { .autorun, autorun, 
autorun.sh };
+  for (n = 0; n  G_N_ELEMENTS (autorun_files); ++n) 
+{
+  /* check if one of the autorun files is present and executable */
+  if (tvm_file_test (mount, autorun_files[n], 
G_FILE_TEST_IS_EXECUTABLE)
+   tvm_file_test (mount, autorun_files[n], 
G_FILE_TEST_IS_REGULAR))
+{
+  /* prompt the user to execute the file */
+  message = g_strdup_printf (_(Would you like to allow \%s\ to 
run?),
+ autorun_files[n]);
+  response = tvm_prompt (context, gnome-fs-executable, 
+ _(Auto-Run Confirmation),
+ _(Auto-Run capability detected), 
message,
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(_Allow Auto-Run), 
TVM_RESPONSE_AUTORUN,
+ NULL);
+  g_free (message);
+
+  /* check if we should autorun */
+  if (response == TVM_RESPONSE_AUTORUN)
+{
+  /* determine the mount point as a string */
+  mount_point = g_mount_get_root (mount);
+  mount_path = g_file_get_path (mount_point);
+  g_object_unref (mount_point);
+
+  /* prepare argv to launch the autorun file */
+  argv = g_new0 (gchar *, 2);
+  argv[0] = g_build_filename (mount_path, autorun_files[n], 
NULL);
+  argv[1] = NULL;
+
+  /* try to launch the autorun file */
+  result = g_spawn_async (mount_path, argv, NULL, 0, NULL, 
NULL, NULL,
+  error);
+  
+  /* free strings */
+  g_strfreev (argv);
+  g_free (mount_path);
+
+  return result;
+}
+}
+}
+}
+
+  return FALSE;
 }
 
 
diff --git a/thunar-volman/tvm-run.c b/thunar-volman/tvm-run.c
index 571047d..112dfa1 100644
--- a/thunar-volman/tvm-run.c
+++ b/thunar-volman/tvm-run.c
@@ -172,7 +172,7 @@ tvm_run_burn_software (TvmContext *context,
   if (!autoburn)
 {
   g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, 
-   _(Autoburning of blank CDs/DVDs is disabled));
+   _(Autoburning of blank CDs and DVDs is disabled));
   return FALSE;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Properly exit when the CD/DVD drive has no media.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to ccafc02e8cce0bc104af60012d8c2c493ed5327e (commit)
   from 81c12834783b92f0784dca25a82277ee5afb20bc (commit)

commit ccafc02e8cce0bc104af60012d8c2c493ed5327e
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 11:21:25 2010 +0200

Properly exit when the CD/DVD drive has no media.

 INSTALL  |  199 +++---
 thunar-volman/tvm-block-device.c |7 +-
 2 files changed, 171 insertions(+), 35 deletions(-)

diff --git a/INSTALL b/INSTALL
index 5458714..7d1c323 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,18 +2,24 @@ Installation Instructions
 *
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==
 
-Briefly, the shell commands `./configure; make; make install' should
+   Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@ may remove or edit it.
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
  `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
- the package.
+ the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
- documentation.
-
-  5. You can remove the program binaries and object files from the
+ documentation.  When installing into a prefix owned by root, it is
+ recommended that the package be configured and built as a regular
+ user, and only the `make install' phase executed with root
+ privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+ this time using the binaries in their final installed location.
+ This target does not install anything.  Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
+
+  6. You can remove the program binaries and object files from the
  source code directory by typing `make clean'.  To also remove the
  files that `configure' created (so you can compile the package for
  a different kind of computer), type `make distclean'.  There is
@@ -67,12 +83,22 @@ The simplest way to compile this package is:
  all sorts of other programs in order to regenerate files that came
  with the distribution.
 
+  7. Often, you can also type `make uninstall' to remove the installed
+ files again.  In practice, not all packages have tested that
+ uninstallation works correctly, even though it is required by the
+ GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+ distcheck', which can by used by developers to test that all other
+ targets like `make install' and `make uninstall' work correctly.
+ This target is generally not run by end users.
+
 Compilers and Options
 =
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the 

[Xfce4-commits] thunar-volman:master Add support for blank CDs and DVDs by launching the burn software.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 269de460833d282df34812bbaffc7f8b0dbe67bf (commit)
   from ccafc02e8cce0bc104af60012d8c2c493ed5327e (commit)

commit 269de460833d282df34812bbaffc7f8b0dbe67bf
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 11:42:45 2010 +0200

Add support for blank CDs and DVDs by launching the burn software.

 configure.in.in|1 +
 thunar-volman/Makefile.am  |6 +
 thunar-volman/tvm-block-device.c   |   11 +-
 thunar-volman/tvm-pango-extensions.c   |  178 
 .../{tvm-run.h = tvm-pango-extensions.h}  |   22 ++--
 thunar-volman/tvm-prompt.c |  175 +++
 thunar-volman/{tvm-block-device.h = tvm-prompt.h} |   28 +++-
 thunar-volman/tvm-run.c|  138 ++-
 thunar-volman/tvm-run.h|   10 +-
 9 files changed, 536 insertions(+), 33 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 439e9ad..1a40559 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -86,6 +86,7 @@ XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
 XDT_CHECK_PACKAGE([GUDEV], [gudev-1.0], [145])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0])
 
diff --git a/thunar-volman/Makefile.am b/thunar-volman/Makefile.am
index 66aa8e9..72d6a5f 100644
--- a/thunar-volman/Makefile.am
+++ b/thunar-volman/Makefile.am
@@ -40,6 +40,10 @@ thunar_volman_SOURCES =  
\
tvm-device.h\
tvm-gio-extensions.c\
tvm-gio-extensions.h\
+   tvm-pango-extensions.c  \
+   tvm-pango-extensions.h  \
+   tvm-prompt.c\
+   tvm-prompt.h\
tvm-run.c   \
tvm-run.h
 
@@ -50,6 +54,7 @@ thunar_volman_CFLAGS =
\
$(GTHREAD_CFLAGS)   \
$(GTK_CFLAGS)   \
$(GUDEV_CFLAGS) \
+   $(LIBXFCE4UI_CFLAGS)\
$(LIBXFCE4UTIL_CFLAGS)  \
$(XFCONF_CFLAGS)\
$(PLATFORM_CFLAGS)
@@ -65,5 +70,6 @@ thunar_volman_LDADD = 
\
$(GTHREAD_LIBS) \
$(GTK_LIBS) \
$(GUDEV_LIBS)   \
+   $(LIBXFCE4UI_LIBS)  \
$(LIBXFCE4UTIL_LIBS)\
$(XFCONF_LIBS)
diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index d111884..42ed5f4 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -326,6 +326,7 @@ tvm_block_device_added (TvmContext *context)
   gboolean is_partition;
   gboolean is_volume;
   guint64  audio_tracks;
+  GError  *error = NULL;
 
   g_return_if_fail (context != NULL);
 
@@ -352,11 +353,15 @@ tvm_block_device_added (TvmContext *context)
 g_udev_device_get_property_as_uint64 (context-device, 
   
ID_CDROM_MEDIA_TRACK_COUNT_AUDIO);
 
+  /* check if we have a blank CD/DVD here */
   if (g_strcmp0 (media_state, blank) == 0)
 {
-#if 0
-  tvm_run_burn_software (client, device, channel, error);
-#endif
+  /* try to run the burn program */
+  if (!tvm_run_burn_software (context, error))
+g_propagate_error (context-error, error);
+
+  /* finish processing the device */
+  tvm_device_handler_finished (context);
 }
   else if (audio_tracks  0)
 {
diff --git a/thunar-volman/tvm-pango-extensions.c 
b/thunar-volman/tvm-pango-extensions.c
new file mode 100644
index 000..d7f68fb
--- /dev/null
+++ b/thunar-volman/tvm-pango-extensions.c
@@ -0,0 +1,178 @@
+/* vi:set et ai sw=2 sts=2 ts=2: */
+/*-
+ * Copyright (c) 2006-2007 Benedikt Meurer be...@xfce.org
+ *
+ * This program is free software; you 

[Xfce4-commits] thunar-volman:master Add support for opening autorun.exe files with wine.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to a1cb43a6485957a74c35f58dd42022d7116f00b7 (commit)
   from fef3c1273d39bfb04c818d379d43db09a5c0323b (commit)

commit a1cb43a6485957a74c35f58dd42022d7116f00b7
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 12:39:46 2010 +0200

Add support for opening autorun.exe files with wine.

 thunar-volman/tvm-block-device.c |   52 ++
 1 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 7c999e9..d9c4d9f 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -134,6 +134,7 @@ tvm_block_device_autorun (TvmContext *context,
   gchar   *autoplay_command;
   gchar   *message;
   gchar   *mount_path;
+  gchar   *wine;
   guintn;
   gint response;
 
@@ -219,6 +220,57 @@ tvm_block_device_autorun (TvmContext *context,
 }
 }
 }
+
+  /* check if wine is present */
+  wine = g_find_program_in_path (wine);
+  if (wine != NULL)
+{
+  /* check if we have an autorun.exe file */
+  if (tvm_file_test (mount, autorun.exe, G_FILE_TEST_IS_REGULAR))
+{
+  /* prompt the user to execute this file */
+  message = g_strdup_printf (_(Would you like to allow \%s\ to 
run?),
+ autorun.exe);
+  response = tvm_prompt (context, gnome-fs-executable, 
+ _(Auto-Run Confirmation),
+ _(Auto-Run capability detected), 
message,
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(_Allow Auto-Run), 
TVM_RESPONSE_AUTORUN,
+ NULL);
+  g_free (message);
+
+  /* check if we should run autogen.exe */
+  if (response == TVM_RESPONSE_AUTORUN)
+{
+  /* determine the mount point as a string */
+  mount_point = g_mount_get_root (mount);
+  mount_path = g_file_get_path (mount_point);
+  g_object_unref (mount_point);
+
+  /* prepare argv to launch the autorun file */
+  argv = g_new0 (gchar *, 3);
+  argv[0] = g_strdup (wine);
+  argv[1] = g_strdup (autorun.exe);
+  argv[2] = NULL;
+
+  /* try to launch the autorun file */
+  result = g_spawn_async (mount_path, argv, NULL, 0, NULL, 
NULL, NULL,
+  error);
+  
+  /* free strings */
+  g_strfreev (argv);
+  g_free (mount_path);
+
+  /* free path to wine */
+  g_free (wine);
+
+  return result;
+}
+}
+
+  /* free path to wine */
+  g_free (wine);
+}
 }
 
   return FALSE;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Make tvm_file_test() case insensitive so that video_ts equals VIDEO_TS.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 81c12834783b92f0784dca25a82277ee5afb20bc (commit)
   from 4fee95888fe46deab053be73b121323467168ede (commit)

commit 81c12834783b92f0784dca25a82277ee5afb20bc
Author: Jannis Pohlmann jan...@xfce.org
Date:   Mon Jul 19 19:33:22 2010 +0200

Make tvm_file_test() case insensitive so that video_ts equals VIDEO_TS.

This fixes a few problems with video CD/DVD autoplay.

 thunar-volman/tvm-block-device.c |   43 +
 1 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 118e383..5d919a0 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -73,23 +73,46 @@ tvm_file_test (GMount  *mount,
const gchar *filename,
GFileTesttest)
 {
-  gboolean result = FALSE;
-  GFile   *mount_point;
-  gchar   *mount_path;
-  gchar   *absolute_path;
+  const gchar *name;
+  gboolean result = FALSE;
+  GFile   *mount_point;
+  gchar   *directory;
+  gchar   *path;
+  GDir*dp;
 
   g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
   g_return_val_if_fail (filename != NULL  *filename != '\0', FALSE);
 
   mount_point = g_mount_get_root (mount);
-  mount_path = g_file_get_path (mount_point);
+  directory = g_file_get_path (mount_point);
   g_object_unref (mount_point);
 
-  absolute_path = g_build_filename (mount_path, filename, NULL);
-  g_free (mount_path);
+  /* try to open the specified directory */
+  dp = g_dir_open (directory, 0, NULL);
+  if (G_LIKELY (dp != NULL))
+{
+  while (!result)
+{
+  /* read the next entry */
+  name = g_dir_read_name (dp);
+  if (G_UNLIKELY (name == NULL))
+break;
+
+  /* check if we have a potential match */
+  if (g_ascii_strcasecmp (name, filename) == 0)
+{
+  /* check if test condition met */
+  path = g_build_filename (directory, name, NULL);
+  result = g_file_test (path, test);
+  g_free (path);
+}
+}
+
+  /* cleanup */
+  g_dir_close (dp);
+}
 
-  result = g_file_test (absolute_path, test);
-  g_free (absolute_path);
+  g_free (directory);
 
   return result;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Implement autoopen (requires an .autoopen or autoopen file).

[Jannis Pohlmann]

Updating branch refs/heads/master
 to d7fb1ad549e9b090b03ccfde1df46771c4b7863c (commit)
   from a1cb43a6485957a74c35f58dd42022d7116f00b7 (commit)

commit d7fb1ad549e9b090b03ccfde1df46771c4b7863c
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 13:06:34 2010 +0200

Implement autoopen (requires an .autoopen or autoopen file).

This finishes our implementation of the Desktop Application Autostart
Specification.

 thunar-volman/tvm-block-device.c |  119 +
 1 files changed, 106 insertions(+), 13 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index d9c4d9f..81cffb2 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -1,6 +1,7 @@
 /* vi:set et ai sw=2 sts=2 ts=2: */
 /*-
- * Copyright (c) 2010 Jannis Pohlmann jan...@xfce.org
+ * Copyright (c) 2007-2008 Benedikt Meurer be...@xfce.org
+ * Copyright (c) 2010  Jannis Pohlmann jan...@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
@@ -22,6 +23,10 @@
 #include config.h
 #endif
 
+#ifdef HAVE_SYS_STAT_H
+#include sys/stat.h
+#endif
+
 #include gio/gio.h
 
 #include gtk/gtk.h
@@ -125,18 +130,24 @@ tvm_block_device_autorun (TvmContext *context,
   GMount *mount,
   GError**error)
 {
-  gboolean autoplay;
-  gboolean autorun;
-  gboolean result = FALSE;
-  GError  *err = NULL;
-  GFile   *mount_point;
-  gchar  **argv;
-  gchar   *autoplay_command;
-  gchar   *message;
-  gchar   *mount_path;
-  gchar   *wine;
-  guintn;
-  gint response;
+  struct stat statb_mount_point;
+  struct stat statb_autoopen;
+  gbooleanautoopen;
+  gbooleanautoplay;
+  gbooleanautorun;
+  gbooleanresult = FALSE;
+  GError *err = NULL;
+  GFile  *mount_point;
+  gchar **argv;
+  gchar  *autoplay_command;
+  gchar  *message;
+  gchar  *mount_path;
+  gchar  *path_autoopen;
+  gchar  *wine;
+  gchar   line[1024];
+  guint   n;
+  FILE   *fp;
+  gintresponse;
 
   g_return_val_if_fail (context != NULL, FALSE);
   g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
@@ -273,6 +284,88 @@ tvm_block_device_autorun (TvmContext *context,
 }
 }
 
+ /* check if autoopen support is enabled */
+  autoopen = xfconf_channel_get_bool (context-channel, /autoopen/enabled, 
FALSE);
+  if (autoopen)
+{
+  /* Autoopen Files (Desktop Application Autostart Specification) */
+  static const gchar *autoopen_files[] = { .autoopen, autoopen };
+  for (n = 0; n  G_N_ELEMENTS (autoopen_files); ++n)
+{
+  /* determine the moint point path */
+  mount_point = g_mount_get_root (mount);
+  mount_path = g_file_get_path (mount_point);
+  g_object_unref (mount_point);
+
+  /* check if one of the autoopen files is present */
+  path_autoopen = g_build_filename (mount_path, autoopen_files[n], 
NULL);
+  fp = fopen (path_autoopen, r);
+  g_free (path_autoopen);
+
+  /* check if the file could be opened */
+  if (G_UNLIKELY (fp != NULL))
+{
+  /* read the first line of the file (MUST NOT be an absolute 
path) */
+  if (fgets (line, sizeof (line), fp) != NULL  
!g_path_is_absolute (line))
+{
+  /* determine the absolute path of the file */
+  path_autoopen = g_build_filename (mount_path, g_strstrip 
(line), NULL);
+
+  /* the file must exist on exactly this device */
+  if (stat (mount_path, statb_mount_point) == 0 
+   stat (path_autoopen, statb_autoopen) == 0
+   S_ISREG (statb_autoopen.st_mode) 
+   (statb_autoopen.st_mode  0111) == 0
+   (statb_mount_point.st_dev == statb_autoopen.st_dev))
+{
+  /* prompt the user whether to autoopen this file */
+  message = g_strdup_printf (_(Would you like to open 
\%s\?), 
+ autoopen_files[n]);
+  response = tvm_prompt (context, gnome-fs-executable, 
+ _(Auto-Open Confirmation),
+ _(Auto-Open capability 
detected), message,
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(_Open), TVM_RESPONSE_AUTORUN,
+ NULL);
+  g_free (message);
+
+  /* check if we should autoopen */
+  if (response == TVM_RESPONSE_AUTORUN)
+{
+  /* prepare the command to autoopen */
+

[Xfce4-commits] thunar-volman:master Add support for wacom volito and bamboo tablets.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 0a3fd067c0dd3e97382faa8d6429bc6d0300a665 (commit)
   from 916ddd8e49cba6cd4912b3efa01f7945718eb33b (commit)

commit 0a3fd067c0dd3e97382faa8d6429bc6d0300a665
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 11:11:43 2010 +0200

Add support for wacom volito and bamboo tablets.

 thunar-volman/tvm-input-device.c |5 -
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/thunar-volman/tvm-input-device.c b/thunar-volman/tvm-input-device.c
index bae1e7c..3be0721 100644
--- a/thunar-volman/tvm-input-device.c
+++ b/thunar-volman/tvm-input-device.c
@@ -38,6 +38,7 @@ tvm_input_device_added (TvmContext *context)
 {
   const gchar *id_class;
   const gchar *id_model;
+  const gchar *id_usb_driver;
   const gchar *driver;
   const gchar *enabled_property = NULL;
   const gchar *command_property = NULL;
@@ -50,6 +51,7 @@ tvm_input_device_added (TvmContext *context)
   id_class = g_udev_device_get_property (context-device, ID_CLASS);
   id_model = g_udev_device_get_property (context-device, ID_MODEL);
   driver = g_udev_device_get_property (context-device, DRIVER);
+  id_usb_driver = g_udev_device_get_property (context-device, 
ID_USB_DRIVER);
 
   if (g_strcmp0 (id_class, kbd) == 0)
 {
@@ -57,7 +59,8 @@ tvm_input_device_added (TvmContext *context)
   enabled_property = /autokeyboard/enabled;
   command_property = /autokeyboard/command;
 }
-  else if (g_strcmp0 (driver, wacom) == 0)
+  else if (g_strcmp0 (driver, wacom) == 0 
+   || g_strcmp0 (id_usb_driver, wacom) == 0)
 {
   /* we have a wacom tablet */
   enabled_property = /autotablet/enabled;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Detect all devices as iPods whose ID_MODEL is prefixed with iPod.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to 40f977ffa365ff38148acd8fcf2a95b875b3c842 (commit)
   from f8b4f75b09138d8f112b3dee36f4a248897ea869 (commit)

commit 40f977ffa365ff38148acd8fcf2a95b875b3c842
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sun Jul 25 18:41:49 2010 +0200

Detect all devices as iPods whose ID_MODEL is prefixed with iPod.

 thunar-volman/tvm-block-device.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index f29608c..b7b8402 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -162,8 +162,8 @@ tvm_block_device_autoipod (TvmContext *context,
 ID_MEDIA_PLAYER);
 
   /* check if we have an iPod */
-  is_ipod = g_strcmp0 (g_udev_device_get_property (context-device, 
-   ID_MODEL), iPod) == 
0;
+  is_ipod = g_str_has_prefix (g_udev_device_get_property (context-device, 
+  ID_MODEL), 
iPod);
   if (is_ipod)
 {
   /* determine the mount point path */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Add support for detecting PTP/gphoto2 cameras.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 1a6787121c8fe4cb15f87b6be066d07721aee66f (commit)
   from ab265b25f13f70b35f3a2ceb2538053507af1883 (commit)

commit 1a6787121c8fe4cb15f87b6be066d07721aee66f
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 11:29:21 2010 +0200

Add support for detecting PTP/gphoto2 cameras.

 thunar-volman/tvm-usb-device.c |9 -
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/thunar-volman/tvm-usb-device.c b/thunar-volman/tvm-usb-device.c
index 8db2c2c..943f362 100644
--- a/thunar-volman/tvm-usb-device.c
+++ b/thunar-volman/tvm-usb-device.c
@@ -40,14 +40,21 @@ tvm_usb_device_added (TvmContext *context)
   const gchar *enabled_property = NULL;
   const gchar *command_property = NULL;
   gboolean enabled;
+  gboolean is_camera;
   gchar   *command;
 
   g_return_if_fail (context != NULL);
 
   /* collect device information */
   driver = g_udev_device_get_property (context-device, DRIVER);
+  is_camera = g_udev_device_get_property_as_boolean (context-device, 
ID_GPHOTO2);
 
-  if (g_strcmp0 (driver, usblp) == 0)
+  if (is_camera)
+{
+  enabled_property = /autophoto/enabled;
+  command_property = /autophoto/command;
+}
+  else if (g_strcmp0 (driver, usblp) == 0)
 {
   enabled_property = /autoprinter/enabled;
   command_property = /autoprinter/command;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:jannis/port-to-udev Add support for iPods with ID_MEDIA_PLAYER unset.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to f8b4f75b09138d8f112b3dee36f4a248897ea869 (commit)
   from fd1d0913716d3b15ef9a4e604f5a81035cd8bc5a (commit)

commit f8b4f75b09138d8f112b3dee36f4a248897ea869
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sun Jul 25 18:19:29 2010 +0200

Add support for iPods with ID_MEDIA_PLAYER unset.

 thunar-volman/tvm-block-device.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 77fd287..f29608c 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -201,7 +201,7 @@ tvm_block_device_autoipod (TvmContext *context,
   if (path_dcim != NULL)
 {
   /* ...so we need to prompt what to do */
-  response = tvm_prompt (context, gnome-dev-ipod, _(Photos and 
Music),
+  response = tvm_prompt (context, multimedia-player, _(Photos and 
Music),
  _(Photos were found on your portable music 
player),
  _(Would you like to import the photos or 
manage the 
music?),
@@ -210,7 +210,7 @@ tvm_block_device_autoipod (TvmContext *context,
  _(Manage _Music), TVM_RESPONSE_MUSIC,
  NULL);
 }
-  else if (is_audio_player)
+  else if (is_audio_player || is_ipod)
 {
   response = TVM_RESPONSE_MUSIC;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Initial work on porting thunar-volman-settings to the new code.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 344b273424f3e49fdedeb677db48db8fdaebf67c (commit)
   from 11b47a673e22f3b9e7715548b5f5ca1a8ee8ba2a (commit)

commit 344b273424f3e49fdedeb677db48db8fdaebf67c
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 13:41:29 2010 +0200

Initial work on porting thunar-volman-settings to the new code.

The storage devices tab already works again.

 .gitignore |1 -
 Makefile.am|   30 +--
 configure.in.in|2 +
 thunar-volman-settings.in  |7 -
 .../Makefile.am|   64 ++--
 thunar-volman-settings/main.c  |   88 
 .../thunar-volman-settings.desktop.in.in   |0
 thunar-volman-settings/tvm-command-entry.c |  418 
 thunar-volman-settings/tvm-command-entry.h |   62 +++
 thunar-volman-settings/tvm-preferences-dialog.c|  325 +++
 thunar-volman-settings/tvm-preferences-dialog.h|   46 +++
 thunar-volman/Makefile.am  |2 -
 12 files changed, 975 insertions(+), 70 deletions(-)

diff --git a/.gitignore b/.gitignore
index 53a839c..e35c136 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,5 @@ mkinstalldirs
 POTFILES
 stamp-it
 stamp-h1
-thunar-volman-settings
 thunar-volman-settings.desktop
 texput.log
diff --git a/Makefile.am b/Makefile.am
index 47b4284..14481ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,8 @@
 SUBDIRS =  \
icons   \
po  \
-   thunar-volman
+   thunar-volman   \
+   thunar-volman-settings
 
 distclean-local:
rm -rf *.spec *.cache *~
@@ -12,38 +13,15 @@ rpm: dist
rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
@rm -f $(PACKAGE)-$(VERSION).tar.gz
 
-libexec_SCRIPTS =  \
-   thunar-volman-settings
-
-thunar-volman-settings: thunar-volman-settings.in Makefile
-   rm -f thunar-volman-settings.gen thunar-volman-settings
-   sed -e s,\...@bindir\@,$(bindir),g\
-$(srcdir)/thunar-volman-settings.in   \
-thunar-volman-settings.gen
-   mv thunar-volman-settings.gen thunar-volman-settings
-
-desktopdir = $(datadir)/applications
-desktop_in_in_files = thunar-volman-settings.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
-   sed -e s,\...@libexecdir\@,$(libexecdir),g  $  $@
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-...@intltool_desktop_rule@
-
 EXTRA_DIST =   \
THANKS  \
intltool-extract.in \
intltool-merge.in   \
-   intltool-update.in  \
-   thunar-volman-settings.in   \
-   $(desktop_in_in_files)
+   intltool-update.in
 
 DISTCLEANFILES =   \
intltool-extract\
intltool-merge  \
-   intltool-update \
-   thunar-volman-settings  \
-   $(desktop_in_files) \
-   $(desktop_DATA)
+   intltool-update
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/configure.in.in b/configure.in.in
index 1a40559..89ba231 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -81,6 +81,7 @@ dnl ***
 dnl *** Check for required packages ***
 dnl ***
 XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [0.34])
+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.18.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.18.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.18.0])
@@ -120,6 +121,7 @@ icons/48x48/Makefile
 icons/scalable/Makefile
 po/Makefile.in
 thunar-volman/Makefile
+thunar-volman-settings/Makefile
 ])
 
 dnl ***
diff --git a/thunar-volman-settings.in b/thunar-volman-settings.in
deleted file mode 100644
index c78d09e..000
--- a/thunar-volman-settings.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2007 Benedikt Meurer be...@xfce.org
-#
-
-# launch the thunar-volman preferences
-exec 

[Xfce4-commits] thunar-volman:master Make the camera tab available again.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 4c8e7f24119632852d1ab381129cdaa1e0347d56 (commit)
   from 2629d51bd957ed1bb9c3e0ab39582b5dacdf72c2 (commit)

commit 4c8e7f24119632852d1ab381129cdaa1e0347d56
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 13:53:21 2010 +0200

Make the camera tab available again.

 thunar-volman-settings/tvm-preferences-dialog.c |   54 ++-
 1 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/thunar-volman-settings/tvm-preferences-dialog.c 
b/thunar-volman-settings/tvm-preferences-dialog.c
index b8a8546..0e6bfcf 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -360,7 +360,8 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   button = gtk_check_button_new_with_mnemonic (_(Play _music files when 
connected));
   xfconf_g_property_bind (channel, /autoipod/enabled, G_TYPE_BOOLEAN, 
   button, active);
-  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_widget_show (button);
 
   entry = tvm_command_entry_new_with_label (_(C_ommand:));
@@ -368,7 +369,56 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   entry, sensitive);
   xfconf_g_property_bind (channel, /autoipod/command, G_TYPE_STRING, 
   entry, command);
-  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (entry);
+
+  /*
+ Cameras
+   */
+  label = gtk_label_new (_(Cameras));
+  vbox = g_object_new (GTK_TYPE_VBOX, border-width, 12, spacing, 12, NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (label);
+  gtk_widget_show (vbox);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Digital Cameras));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (camera-photo, GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Import digital photographs 
+ when connected));
+  xfconf_g_property_bind (channel, /autophoto/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(_Command:));
+  xfconf_g_property_bind (channel, /autophoto/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autophoto/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_widget_show (entry);
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Add support for USB media players and iPods.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 2359de82d71b8bfa89fc06e0b4abdd8e44c9ee3b (commit)
   from a75667cca11293e4f6582ac219f32b92cfbb9462 (commit)

commit 2359de82d71b8bfa89fc06e0b4abdd8e44c9ee3b
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 15:16:54 2010 +0200

Add support for USB media players and iPods.

 thunar-volman/tvm-block-device.c |  115 +-
 1 files changed, 113 insertions(+), 2 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index dfe570b..268d41a 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -53,6 +53,9 @@ typedef gboolean (*TvmBlockDeviceHandler) (TvmContext 
*context,
 static gboolean tvm_file_test   (GMount  *mount,
  const gchar *filename,
  GFileTesttest);
+static gboolean tvm_block_device_autoipod   (TvmContext  *context,
+ GMount  *mount,
+ GError **error);
 static gboolean tvm_block_device_autophoto  (TvmContext  *context,
  GMount  *mount,
  GError **error);
@@ -67,9 +70,7 @@ static gboolean tvm_block_device_autobrowse (TvmContext  
*context,
 
 static TvmBlockDeviceHandler block_device_handlers[] =
 {
-#if 0
   tvm_block_device_autoipod,
-#endif
   tvm_block_device_autophoto,
   tvm_block_device_autorun,
   tvm_block_device_autobrowse,
@@ -129,6 +130,116 @@ tvm_file_test (GMount  *mount,
 
 
 static gboolean
+tvm_block_device_autoipod (TvmContext *context,
+   GMount *mount,
+   GError**error)
+{
+  gboolean autoipod;
+  gboolean is_audio_player = FALSE;
+  gboolean is_ipod = FALSE;
+  gboolean result = FALSE;
+  GFile   *mount_point;
+  gchar   *autoipod_command;
+  gchar   *autophoto_command;
+  gchar   *mount_path;
+  gchar   *path_dcim = NULL;
+  gint response = TVM_RESPONSE_NONE;
+
+  g_return_val_if_fail (context != NULL, FALSE);
+  g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  autoipod = xfconf_channel_get_bool (context-channel, /autoipod/enabled, 
FALSE);
+  if (autoipod)
+{
+  /* check if we have a portable audio player here */
+  is_audio_player = g_udev_device_has_property (context-device, 
+ID_MEDIA_PLAYER);
+
+  /* check if we have an iPod */
+  is_ipod = g_strcmp0 (g_udev_device_get_property (context-device, 
+   ID_MODEL), iPod) == 
0;
+  if (is_ipod)
+{
+  /* determine the mount point path */
+  mount_point = g_mount_get_root (mount);
+  mount_path = g_file_get_path (mount_point);
+  g_object_unref (mount_point);
+
+  /* build dcim path */
+  path_dcim = g_build_filename (mount_path, dcim, NULL);
+  g_free (mount_path);
+
+  /* check if the iPod has photos */
+  if (!g_file_test (path_dcim, G_FILE_TEST_IS_DIR))
+{
+  /* no photos */
+  g_free (path_dcim);
+  path_dcim = NULL;
+}
+}
+
+  autoipod_command = xfconf_channel_get_string (context-channel,
+/autoipod/command, NULL);
+  autophoto_command = xfconf_channel_get_string (context-channel,
+ /autophoto/command, 
NULL);
+
+  /* check if autophoto command is specified, otherwise we cannot handle 
the photos 
+   * on the iPod anyway */
+  if (autophoto_command == NULL || *autophoto_command == '\0')
+{
+  g_free (path_dcim);
+  path_dcim = NULL;
+}
+
+  /* iPods can carry music and photos... */
+  if (path_dcim != NULL)
+{
+  /* ...so we need to prompt what to do */
+  response = tvm_prompt (context, gnome-dev-ipod, _(Photos and 
Music),
+ _(Photos were found on your portable music 
player),
+ _(Would you like to import the photos or 
manage the 
+   music?),
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(Import _Photos), TVM_RESPONSE_PHOTOS,
+ _(Manage _Music), TVM_RESPONSE_MUSIC,
+ NULL);
+}
+  else if (is_audio_player)
+{
+  response = TVM_RESPONSE_MUSIC;
+}
+
+  /* check what to do */
+  if (response == TVM_RESPONSE_MUSIC)
+{
+  /* run the preferred application to manage music players */
+  result = 

[Xfce4-commits] thunar-volman:master Add support for keyboards, mice and tablets.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 916ddd8e49cba6cd4912b3efa01f7945718eb33b (commit)
   from 2359de82d71b8bfa89fc06e0b4abdd8e44c9ee3b (commit)

commit 916ddd8e49cba6cd4912b3efa01f7945718eb33b
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 16:01:48 2010 +0200

Add support for keyboards, mice and tablets.

 thunar-volman/Makefile.am  |2 +
 thunar-volman/tvm-device.c |3 +-
 thunar-volman/tvm-input-device.c   |  109 
 .../{tvm-block-device.h = tvm-input-device.h} |8 +-
 4 files changed, 117 insertions(+), 5 deletions(-)

diff --git a/thunar-volman/Makefile.am b/thunar-volman/Makefile.am
index 72d6a5f..9d9153d 100644
--- a/thunar-volman/Makefile.am
+++ b/thunar-volman/Makefile.am
@@ -40,6 +40,8 @@ thunar_volman_SOURCES =   
\
tvm-device.h\
tvm-gio-extensions.c\
tvm-gio-extensions.h\
+   tvm-input-device.c  \
+   tvm-input-device.h  \
tvm-pango-extensions.c  \
tvm-pango-extensions.h  \
tvm-prompt.c\
diff --git a/thunar-volman/tvm-device.c b/thunar-volman/tvm-device.c
index 6c0c045..4da3aae 100644
--- a/thunar-volman/tvm-device.c
+++ b/thunar-volman/tvm-device.c
@@ -33,6 +33,7 @@
 #include thunar-volman/tvm-block-device.h
 #include thunar-volman/tvm-context.h
 #include thunar-volman/tvm-device.h
+#include thunar-volman/tvm-input-device.h
 
 
 
@@ -55,8 +56,8 @@ struct _TvmDeviceHandler
 static TvmDeviceHandler subsystem_handlers[] = 
 {
   { block,   tvm_block_device_added },
-#if 0
   { input,   tvm_input_device_added },
+#if 0
   { sound,   tvm_sound_device_added },
   { video4linux, tvm_video_device_added },
 #endif
diff --git a/thunar-volman/tvm-input-device.c b/thunar-volman/tvm-input-device.c
new file mode 100644
index 000..bae1e7c
--- /dev/null
+++ b/thunar-volman/tvm-input-device.c
@@ -0,0 +1,109 @@
+/* vi:set et ai sw=2 sts=2 ts=2: */
+/*-
+ * Copyright (c) 2010 Jannis Pohlmann jan...@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 (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 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
+
+#include gudev/gudev.h
+
+#include libxfce4util/libxfce4util.h
+
+#include thunar-volman/tvm-input-device.h
+#include thunar-volman/tvm-context.h
+#include thunar-volman/tvm-device.h
+#include thunar-volman/tvm-run.h
+
+
+
+void
+tvm_input_device_added (TvmContext *context)
+{
+  const gchar *id_class;
+  const gchar *id_model;
+  const gchar *driver;
+  const gchar *enabled_property = NULL;
+  const gchar *command_property = NULL;
+  gboolean enabled;
+  gchar   *command;
+
+  g_return_if_fail (context != NULL);
+
+  /* collect device information */
+  id_class = g_udev_device_get_property (context-device, ID_CLASS);
+  id_model = g_udev_device_get_property (context-device, ID_MODEL);
+  driver = g_udev_device_get_property (context-device, DRIVER);
+
+  if (g_strcmp0 (id_class, kbd) == 0)
+{
+  /* we have a keyboard */
+  enabled_property = /autokeyboard/enabled;
+  command_property = /autokeyboard/command;
+}
+  else if (g_strcmp0 (driver, wacom) == 0)
+{
+  /* we have a wacom tablet */
+  enabled_property = /autotablet/enabled;
+  command_property = /autotabled/command;
+}
+  else if (g_strcmp0 (id_class, mouse) == 0)
+{
+  if (g_strstr_len (id_model, -1, Tablet) != NULL 
+  || g_strstr_len (id_model, -1, TABLET) != NULL
+  || g_strstr_len (id_model, -1, tablet) != NULL)
+{
+  /* we have a tablet that can be used as a mouse */
+  enabled_property = /autotablet/enabled;
+  command_property = /autotablet/command;
+}
+  else
+{
+  /* we have a normal mouse */
+  enabled_property = /automouse/enabled;
+  command_property = /automouse/command;
+}
+}
+
+  /* check if we 

[Xfce4-commits] thunar-volman:master Implement photo import from cameras detected as mass storage devices.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to a75667cca11293e4f6582ac219f32b92cfbb9462 (commit)
   from d7fb1ad549e9b090b03ccfde1df46771c4b7863c (commit)

commit a75667cca11293e4f6582ac219f32b92cfbb9462
Author: Jannis Pohlmann jan...@xfce.org
Date:   Tue Jul 20 13:55:54 2010 +0200

Implement photo import from cameras detected as mass storage devices.

 thunar-volman/tvm-block-device.c |   77 +++--
 1 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 81cffb2..dfe570b 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -53,6 +53,9 @@ typedef gboolean (*TvmBlockDeviceHandler) (TvmContext 
*context,
 static gboolean tvm_file_test   (GMount  *mount,
  const gchar *filename,
  GFileTesttest);
+static gboolean tvm_block_device_autophoto  (TvmContext  *context,
+ GMount  *mount,
+ GError **error);
 static gboolean tvm_block_device_autorun(TvmContext  *context,
  GMount  *mount,
  GError **error);
@@ -66,8 +69,8 @@ static TvmBlockDeviceHandler block_device_handlers[] =
 {
 #if 0
   tvm_block_device_autoipod,
-  tvm_block_device_autophoto,
 #endif
+  tvm_block_device_autophoto,
   tvm_block_device_autorun,
   tvm_block_device_autobrowse,
 };
@@ -126,6 +129,61 @@ tvm_file_test (GMount  *mount,
 
 
 static gboolean
+tvm_block_device_autophoto (TvmContext *context,
+GMount *mount,
+GError**error)
+{
+  gboolean autophoto;
+  gboolean result = FALSE;
+  gchar   *autophoto_command;
+  gint response;
+
+  g_return_val_if_fail (context != NULL, FALSE);
+  g_return_val_if_fail (G_IS_MOUNT (mount), FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  /* check if autophoto support is enabled */
+  autophoto = xfconf_channel_get_bool (context-channel, /autophoto/enabled, 
FALSE);
+  if (autophoto)
+{
+  autophoto_command = xfconf_channel_get_string (context-channel, 
+ /autophoto/command, 
NULL);
+  if (autophoto_command != NULL  *autophoto_command != '\0')
+{
+  /* check if we have any photos on the volume */
+  if (tvm_file_test (mount, dcim, G_FILE_TEST_IS_DIR))
+{
+  /* ask the user to import photos */
+  response = tvm_prompt (context, camera-photo, _(Photo 
Import),
+ _(A photo card has been detected),
+ _(There are photos on the card. Would 
you like to 
+   add these photos to your album?),
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(Import _Photos), TVM_RESPONSE_PHOTOS,
+ NULL);
+
+  if (response == TVM_RESPONSE_PHOTOS)
+{
+  /* run the preferred photo application */
+  result = tvm_run_command (context, mount, autophoto_command, 
error);
+}
+  else
+{
+  /* pretend that we handled the device */
+  result = TRUE;
+}
+}
+}
+  
+  g_free (autophoto_command);
+}
+
+  return result;
+}
+
+
+
+static gboolean
 tvm_block_device_autorun (TvmContext *context,
   GMount *mount,
   GError**error)
@@ -221,12 +279,15 @@ tvm_block_device_autorun (TvmContext *context,
 
   /* try to launch the autorun file */
   result = g_spawn_async (mount_path, argv, NULL, 0, NULL, 
NULL, NULL,
-  error);
+  err);
   
   /* free strings */
   g_strfreev (argv);
   g_free (mount_path);
 
+  if (err != NULL)
+g_propagate_error (error, err);
+
   return result;
 }
 }
@@ -266,7 +327,7 @@ tvm_block_device_autorun (TvmContext *context,
 
   /* try to launch the autorun file */
   result = g_spawn_async (mount_path, argv, NULL, 0, NULL, 
NULL, NULL,
-  error);
+  err);
   
   /* free strings */
   g_strfreev (argv);
@@ -275,6 +336,9 @@ tvm_block_device_autorun (TvmContext *context,
   /* free path to wine 

[Xfce4-commits] thunar-volman:master Add support for detecting USB printers.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to ab265b25f13f70b35f3a2ceb2538053507af1883 (commit)
   from 0a3fd067c0dd3e97382faa8d6429bc6d0300a665 (commit)

commit ab265b25f13f70b35f3a2ceb2538053507af1883
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 11:12:11 2010 +0200

Add support for detecting USB printers.

 thunar-volman/Makefile.am  |4 +-
 thunar-volman/tvm-device.c |2 +
 .../{tvm-input-device.c = tvm-usb-device.c}   |   47 +++
 .../{tvm-block-device.h = tvm-usb-device.h}   |8 ++--
 4 files changed, 17 insertions(+), 44 deletions(-)

diff --git a/thunar-volman/Makefile.am b/thunar-volman/Makefile.am
index 9d9153d..7e73183 100644
--- a/thunar-volman/Makefile.am
+++ b/thunar-volman/Makefile.am
@@ -47,7 +47,9 @@ thunar_volman_SOURCES =   
\
tvm-prompt.c\
tvm-prompt.h\
tvm-run.c   \
-   tvm-run.h
+   tvm-run.h   \
+   tvm-usb-device.c\
+   tvm-usb-device.h
 
 thunar_volman_CFLAGS = \
$(DBUS_CFLAGS)  \
diff --git a/thunar-volman/tvm-device.c b/thunar-volman/tvm-device.c
index 4da3aae..7249769 100644
--- a/thunar-volman/tvm-device.c
+++ b/thunar-volman/tvm-device.c
@@ -34,6 +34,7 @@
 #include thunar-volman/tvm-context.h
 #include thunar-volman/tvm-device.h
 #include thunar-volman/tvm-input-device.h
+#include thunar-volman/tvm-usb-device.h
 
 
 
@@ -57,6 +58,7 @@ static TvmDeviceHandler subsystem_handlers[] =
 {
   { block,   tvm_block_device_added },
   { input,   tvm_input_device_added },
+  { usb, tvm_usb_device_added   },
 #if 0
   { sound,   tvm_sound_device_added },
   { video4linux, tvm_video_device_added },
diff --git a/thunar-volman/tvm-input-device.c b/thunar-volman/tvm-usb-device.c
similarity index 57%
copy from thunar-volman/tvm-input-device.c
copy to thunar-volman/tvm-usb-device.c
index 3be0721..8db2c2c 100644
--- a/thunar-volman/tvm-input-device.c
+++ b/thunar-volman/tvm-usb-device.c
@@ -26,19 +26,16 @@
 
 #include libxfce4util/libxfce4util.h
 
-#include thunar-volman/tvm-input-device.h
 #include thunar-volman/tvm-context.h
 #include thunar-volman/tvm-device.h
 #include thunar-volman/tvm-run.h
+#include thunar-volman/tvm-usb-device.h
 
 
 
 void
-tvm_input_device_added (TvmContext *context)
+tvm_usb_device_added (TvmContext *context)
 {
-  const gchar *id_class;
-  const gchar *id_model;
-  const gchar *id_usb_driver;
   const gchar *driver;
   const gchar *enabled_property = NULL;
   const gchar *command_property = NULL;
@@ -48,46 +45,18 @@ tvm_input_device_added (TvmContext *context)
   g_return_if_fail (context != NULL);
 
   /* collect device information */
-  id_class = g_udev_device_get_property (context-device, ID_CLASS);
-  id_model = g_udev_device_get_property (context-device, ID_MODEL);
   driver = g_udev_device_get_property (context-device, DRIVER);
-  id_usb_driver = g_udev_device_get_property (context-device, 
ID_USB_DRIVER);
 
-  if (g_strcmp0 (id_class, kbd) == 0)
+  if (g_strcmp0 (driver, usblp) == 0)
 {
-  /* we have a keyboard */
-  enabled_property = /autokeyboard/enabled;
-  command_property = /autokeyboard/command;
-}
-  else if (g_strcmp0 (driver, wacom) == 0 
-   || g_strcmp0 (id_usb_driver, wacom) == 0)
-{
-  /* we have a wacom tablet */
-  enabled_property = /autotablet/enabled;
-  command_property = /autotabled/command;
-}
-  else if (g_strcmp0 (id_class, mouse) == 0)
-{
-  if (g_strstr_len (id_model, -1, Tablet) != NULL 
-  || g_strstr_len (id_model, -1, TABLET) != NULL
-  || g_strstr_len (id_model, -1, tablet) != NULL)
-{
-  /* we have a tablet that can be used as a mouse */
-  enabled_property = /autotablet/enabled;
-  command_property = /autotablet/command;
-}
-  else
-{
-  /* we have a normal mouse */
-  enabled_property = /automouse/enabled;
-  command_property = /automouse/command;
-}
+  enabled_property = /autoprinter/enabled;
+  command_property = /autoprinter/command;
 }
 
   /* check if we have a device that we support */
   if (enabled_property != NULL  command_property != NULL)
 {
-  /* check whether handling the keyboard/tablet/mouse is enabled */
+  /* check whether handling the printer or whatever is enabled */
   enabled = xfconf_channel_get_bool (context-channel, enabled_property, 
FALSE);
   if (enabled)
 {
@@ -102,9 +71,9 @@ tvm_input_device_added (TvmContext *context)
 }
   else
 {

[Xfce4-commits] thunar-volman:master Fix typo spotted by Linoel Le Folgoc.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 1e50062cee660551c1c2759baf00dfd8aecc07f3 (commit)
   from 1a6787121c8fe4cb15f87b6be066d07721aee66f (commit)

commit 1e50062cee660551c1c2759baf00dfd8aecc07f3
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 11:54:15 2010 +0200

Fix typo spotted by Linoel Le Folgoc.

 thunar-volman/tvm-input-device.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/thunar-volman/tvm-input-device.c b/thunar-volman/tvm-input-device.c
index 3be0721..2747be1 100644
--- a/thunar-volman/tvm-input-device.c
+++ b/thunar-volman/tvm-input-device.c
@@ -64,7 +64,7 @@ tvm_input_device_added (TvmContext *context)
 {
   /* we have a wacom tablet */
   enabled_property = /autotablet/enabled;
-  command_property = /autotabled/command;
+  command_property = /autotablet/command;
 }
   else if (g_strcmp0 (id_class, mouse) == 0)
 {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Add function to run the default audio CD player.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 8761d7e17778886a60ce96dd6d736d5b9b0c147f (commit)
   from 1e50062cee660551c1c2759baf00dfd8aecc07f3 (commit)

commit 8761d7e17778886a60ce96dd6d736d5b9b0c147f
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 12:25:46 2010 +0200

Add function to run the default audio CD player.

 thunar-volman/tvm-run.c |   42 +++---
 thunar-volman/tvm-run.h |2 ++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/thunar-volman/tvm-run.c b/thunar-volman/tvm-run.c
index 112dfa1..a4bc67b 100644
--- a/thunar-volman/tvm-run.c
+++ b/thunar-volman/tvm-run.c
@@ -155,7 +155,6 @@ tvm_run_burn_software (TvmContext *context,
 ID_CDROM_MEDIA_DVD_PLUS_R,
 ID_CDROM_MEDIA_DVD_PLUS_RW,
   };
-  gbooleanautoburn;
   gbooleanis_cd = FALSE;
   gbooleanis_dvd = FALSE;
   gbooleanresult = FALSE;
@@ -168,8 +167,7 @@ tvm_run_burn_software (TvmContext *context,
   g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
   /* abort without error if autoburning is turned off */
-  autoburn = xfconf_channel_get_bool (context-channel, /autoburn/enabled, 
FALSE);
-  if (!autoburn)
+  if (!xfconf_channel_get_bool (context-channel, /autoburn/enabled, FALSE))
 {
   g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, 
_(Autoburning of blank CDs and DVDs is disabled));
@@ -242,3 +240,41 @@ tvm_run_burn_software (TvmContext *context,
   return result;
 }
 
+
+
+gboolean 
+tvm_run_cd_player (TvmContext *context,
+   GError**error)
+{
+  gboolean result = FALSE;
+  gchar   *command;
+
+  g_return_val_if_fail (context != NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+  /* check whether autoplaying audio CDs is enabled */
+  if (xfconf_channel_get_bool (context-channel, 
/autoplay-audio-cds/enabled, FALSE))
+{
+  /* determine the audio CD player command */
+  command = xfconf_channel_get_string (context-channel, 
+   /autoplay-audio-cds/command, 
NULL);
+
+  /* check whether the command is set and non-empty */
+  if (command != NULL  *command != '\0')
+{
+  /* try to lanuch the audio CD player */
+  result = tvm_run_command (context, NULL, command, error);
+}
+  else
+{
+  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+   _(The CD player command is undefined));
+}
+  
+  /* free the command string */
+  g_free (command);
+}
+
+  return result;
+}
diff --git a/thunar-volman/tvm-run.h b/thunar-volman/tvm-run.h
index dc67d13..c3b472a 100644
--- a/thunar-volman/tvm-run.h
+++ b/thunar-volman/tvm-run.h
@@ -33,6 +33,8 @@ gboolean tvm_run_command(TvmContext  *context,
  GError **error);
 gboolean  tvm_run_burn_software (TvmContext  *context,
  GError **error);
+gboolean  tvm_run_cd_player (TvmContext  *context,
+ GError **error);
 
 G_END_DECLS
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Add support for mixed data/audio and pure audio CDs.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 11b47a673e22f3b9e7715548b5f5ca1a8ee8ba2a (commit)
   from 8761d7e17778886a60ce96dd6d736d5b9b0c147f (commit)

commit 11b47a673e22f3b9e7715548b5f5ca1a8ee8ba2a
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 12:26:10 2010 +0200

Add support for mixed data/audio and pure audio CDs.

In addition, a few more calls to tvm_device_handler_finished() have been
added to make sure thunar-volman exits on unknown/unsupported devices
and on features that are disabled. A few checks have been added to only
do something if the corresponding feature is enabled.

 thunar-volman/tvm-block-device.c |  101 +++---
 1 files changed, 93 insertions(+), 8 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 268d41a..b586df1 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -707,8 +707,12 @@ tvm_block_device_added (TvmContext *context)
   gboolean is_cdrom;
   gboolean is_partition;
   gboolean is_volume;
+  gboolean automount;
+  gboolean autoplay;
   guint64  audio_tracks;
+  guint64  data_tracks;
   GError  *error = NULL;
+  gint response;
 
   g_return_if_fail (context != NULL);
 
@@ -731,6 +735,9 @@ tvm_block_device_added (TvmContext *context)
   /* collect CD information */
   media_state = g_udev_device_get_property (context-device, 
 ID_CDROM_MEDIA_STATE);
+  data_tracks =
+g_udev_device_get_property_as_uint64 (context-device,
+  
ID_CDROM_MEDIA_TRACK_COUNT_DATA);
   audio_tracks = 
 g_udev_device_get_property_as_uint64 (context-device, 
   
ID_CDROM_MEDIA_TRACK_COUNT_AUDIO);
@@ -745,17 +752,84 @@ tvm_block_device_added (TvmContext *context)
   /* finish processing the device */
   tvm_device_handler_finished (context);
 }
+  else if (audio_tracks  0  data_tracks  0)
+{
+  /* check if both autoplay and automounting of CDs/DVDs is 
enabled */
+  automount = xfconf_channel_get_bool (context-channel, 
+   /automount-media/enabled, 
FALSE);
+  autoplay = xfconf_channel_get_bool (context-channel, 
+  
/autoplay-audio-cds/enabled, FALSE);
+  if (automount  autoplay)
+{
+  /* ask what to do with the mixed audio/data disc */
+  response = tvm_prompt (context, gnome-dev-cdrom-audio,
+ _(Audio/Data CD),
+ _(The CD in the drive contains both 
music 
+   and files),
+ _(Would you like to listen to music 
or 
+   browse the files?),
+ _(Ig_nore), GTK_RESPONSE_CANCEL,
+ _(_Browse Files), 
TVM_RESPONSE_BROWSE,
+ _(_Play CD), TVM_RESPONSE_PLAY, 
+ NULL);
+
+  switch (response)
+{
+case TVM_RESPONSE_PLAY:
+  goto autoplay_disc;
+  break;
+
+case TVM_RESPONSE_BROWSE:
+  goto automount_disc;
+  break;
+
+default:
+  /* finish processing the device */
+  tvm_device_handler_finished (context);
+  break;
+}
+}
+  else if (automount)
+{
+  /* just mount the disc automatically */
+  goto automount_disc;
+}
+  else if (autoplay)
+{
+  /* just play the disc automatically */
+  goto autoplay_disc;
+}
+  else
+{
+  /* finish processing the device */
+  tvm_device_handler_finished (context);
+}
+}
   else if (audio_tracks  0)
 {
-#if 0
-  /* TODO detect mixed CDs with audio AND data tracks */
-  tvm_run_cd_player (client, device, channel, error);
-#endif
+autoplay_disc:
+  /* open the audio CD in the favorite CD player */
+  tvm_run_cd_player (context, context-error);
+
+  /* finish processing the device */
+  tvm_device_handler_finished (context);
+}
+  else if (data_tracks  0)
+{

[Xfce4-commits] thunar-volman:master Make the PDA tab available agian. Disabled because unsupported.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 8dfedf486e21d592409fdd2db52e38a1057a4317 (commit)
   from 4c8e7f24119632852d1ab381129cdaa1e0347d56 (commit)

commit 8dfedf486e21d592409fdd2db52e38a1057a4317
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 13:57:13 2010 +0200

Make the PDA tab available agian. Disabled because unsupported.

 thunar-volman-settings/tvm-preferences-dialog.c |   90 +++
 1 files changed, 90 insertions(+), 0 deletions(-)

diff --git a/thunar-volman-settings/tvm-preferences-dialog.c 
b/thunar-volman-settings/tvm-preferences-dialog.c
index 0e6bfcf..8389f73 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -420,6 +420,96 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, 
 GTK_FILL, 0, 0);
   gtk_widget_show (entry);
+
+  /*
+ PDAs
+   */
+  label = gtk_label_new (_(PDAs));
+  vbox = g_object_new (GTK_TYPE_VBOX, border-width, 12, spacing, 12, NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (label);
+  gtk_widget_show (vbox);
+
+  /* FIXME make the vbox sensitive again as soon as there is PDA support */
+  gtk_widget_set_sensitive (vbox, FALSE);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Palm™));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (palm-pilot, GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Sync _Palm™ devices 
+ when connected));
+  xfconf_g_property_bind (channel, /autopalm/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(_Command:));
+  xfconf_g_property_bind (channel, /autopalm/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autopalm/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (entry);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Pocket PCs));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (tvm-dev-pocketpc, 
GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Sync Pocket P_C devices 
+ when connected));
+  xfconf_g_property_bind (channel, /autopocketpc/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(C_ommand:));
+  xfconf_g_property_bind (channel, /autopocketpc/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autopocketpc/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
+GTK_FILL, 0, 0);
+  

[Xfce4-commits] thunar-volman:master Implement the multimedia tab of thunar-volman-settings again.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 2629d51bd957ed1bb9c3e0ab39582b5dacdf72c2 (commit)
   from 344b273424f3e49fdedeb677db48db8fdaebf67c (commit)

commit 2629d51bd957ed1bb9c3e0ab39582b5dacdf72c2
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 13:48:24 2010 +0200

Implement the multimedia tab of thunar-volman-settings again.

 thunar-volman-settings/tvm-preferences-dialog.c |  158 +--
 1 files changed, 146 insertions(+), 12 deletions(-)

diff --git a/thunar-volman-settings/tvm-preferences-dialog.c 
b/thunar-volman-settings/tvm-preferences-dialog.c
index 89acc75..b8a8546 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -186,12 +186,15 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
 GTK_FILL, 0, 0);
   gtk_widget_show (button);
 
-  button = gtk_check_button_new_with_mnemonic (_(Auto-open files on new 
drives and media));
+  button = gtk_check_button_new_with_mnemonic (_(Auto-open files on new 
drives 
+ and media));
   xfconf_g_property_bind (channel, /autoopen/enabled, G_TYPE_BOOLEAN, 
button, active);
-  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 4, 5, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 4, 5, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_widget_show (button);
 
-  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
GTK_SHADOW_NONE, NULL);
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
   gtk_widget_show (frame);
 
@@ -212,30 +215,161 @@ tvm_preferences_dialog_init (TvmPreferencesDialog 
*dialog)
   gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
   gtk_widget_show (image);
 
-  button = gtk_check_button_new_with_mnemonic (_(_Burn a CD or DVD when a 
blank disc is inserted));
-  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, 
button, active);
-  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  button = gtk_check_button_new_with_mnemonic (_(_Burn a CD or DVD when a 
blank disc 
+ is inserted));
+  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_widget_show (button);
 
   /* use a size group to make sure both labels request the same width */
   size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
   entry = tvm_command_entry_new_with_label (_(Command for _Data CDs:));
-  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, entry, 
sensitive);
-  xfconf_g_property_bind (channel, /autoburn/data-cd-command, G_TYPE_STRING, 
entry, command);
-  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autoburn/data-cd-command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_size_group_add_widget (size_group, TVM_COMMAND_ENTRY (entry)-label);
   gtk_widget_show (entry);
 
   entry = tvm_command_entry_new_with_label (_(Command for A_udio CDs:));
-  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, entry, 
sensitive);
-  xfconf_g_property_bind (channel, /autoburn/audio-cd-command, 
G_TYPE_STRING, entry, command);
-  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3, GTK_EXPAND | 
GTK_FILL, GTK_FILL, 0, 0);
+  xfconf_g_property_bind (channel, /autoburn/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autoburn/audio-cd-command, 
G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 2, 3, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
   gtk_size_group_add_widget (size_group, TVM_COMMAND_ENTRY (entry)-label);
   gtk_widget_show (entry);
 
   /* release the size group */
   g_object_unref (G_OBJECT (size_group));
+
+  /*
+ Multimedia
+   */
+  label = gtk_label_new (_(Multimedia));
+  vbox = g_object_new (GTK_TYPE_VBOX, border-width, 12, spacing, 12, NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (label);
+  gtk_widget_show (vbox);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start 

[Xfce4-commits] thunar-volman:master Fix path to the thunar-volman-settings executable.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 45335a4707272417b3c5fbb28ffe3dd6f4926d1d (commit)
   from 693abb789907d8548ce22bbc8629e3ece1cd8f39 (commit)

commit 45335a4707272417b3c5fbb28ffe3dd6f4926d1d
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 14:36:49 2010 +0200

Fix path to the thunar-volman-settings executable.

 .../thunar-volman-settings.desktop.in.in   |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/thunar-volman-settings/thunar-volman-settings.desktop.in.in 
b/thunar-volman-settings/thunar-volman-settings.desktop.in.in
index b82fb13..46d3b1b 100644
--- a/thunar-volman-settings/thunar-volman-settings.desktop.in.in
+++ b/thunar-volman-settings/thunar-volman-settings.desktop.in.in
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 _Name=Removable Drives and Media
 _Comment=Configure management of removable drives and media
-ex...@libexecdir@/thunar-volman-settings
+Exec=thunar-volman-settings
 Icon=gnome-dev-removable
 Terminal=false
 StartupNotify=true
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Make the printers page available again.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 24890c59eb95b8488e0cacdc43ead2c13fec9523 (commit)
   from 8dfedf486e21d592409fdd2db52e38a1057a4317 (commit)

commit 24890c59eb95b8488e0cacdc43ead2c13fec9523
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 13:59:18 2010 +0200

Make the printers page available again.

 thunar-volman-settings/tvm-preferences-dialog.c |   48 +++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/thunar-volman-settings/tvm-preferences-dialog.c 
b/thunar-volman-settings/tvm-preferences-dialog.c
index 8389f73..f52a550 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -510,6 +510,54 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
 GTK_FILL, 0, 0);
   gtk_widget_show (entry);
+
+  /*
+ Printers
+   */
+  label = gtk_label_new (_(Printers));
+  vbox = g_object_new (GTK_TYPE_VBOX, border-width, 12, spacing, 12, NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (label);
+  gtk_widget_show (vbox);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Printers));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (gnome-dev-printer, 
GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Automatically run a program 
+ when a _printer is 
connected));
+  xfconf_g_property_bind (channel, /autoprinter/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(_Command:));
+  xfconf_g_property_bind (channel, /autoprinter/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autoprinter/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
+GTK_FILL, 0, 0);
+  gtk_widget_show (entry);
 }
 
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Make the input devices tab available again.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 3407dce340a7860de244ce2c1957f346482a1b80 (commit)
   from 24890c59eb95b8488e0cacdc43ead2c13fec9523 (commit)

commit 3407dce340a7860de244ce2c1957f346482a1b80
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 14:07:36 2010 +0200

Make the input devices tab available again.

Except for PDA (Palm, PocketPC) support everything is more or less
complete now.

 thunar-volman-settings/tvm-preferences-dialog.c |  126 +++
 1 files changed, 126 insertions(+), 0 deletions(-)

diff --git a/thunar-volman-settings/tvm-preferences-dialog.c 
b/thunar-volman-settings/tvm-preferences-dialog.c
index f52a550..13772e8 100644
--- a/thunar-volman-settings/tvm-preferences-dialog.c
+++ b/thunar-volman-settings/tvm-preferences-dialog.c
@@ -558,6 +558,132 @@ tvm_preferences_dialog_init (TvmPreferencesDialog *dialog)
   gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
 GTK_FILL, 0, 0);
   gtk_widget_show (entry);
+
+  /*
+ Input Devices
+   */
+  label = gtk_label_new (_(Input Devices));
+  vbox = g_object_new (GTK_TYPE_VBOX, border-width, 12, spacing, 12, NULL);
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+  gtk_widget_show (label);
+  gtk_widget_show (vbox);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Keyboards));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (gnome-dev-keyboard, 
GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Automatically run a program 
+ when an USB _keyboard is 
connected));
+  xfconf_g_property_bind (channel, /autokeyboard/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL, 
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(_Command:));
+  xfconf_g_property_bind (channel, /autokeyboard/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /autokeyboard/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
+GTK_FILL, 0, 0);
+  gtk_widget_show (entry);
+
+  frame = g_object_new (GTK_TYPE_FRAME, border-width, 0, shadow-type, 
+GTK_SHADOW_NONE, NULL);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+  gtk_widget_show (frame);
+
+  label = gtk_label_new (_(Mice));
+  gtk_label_set_attributes (GTK_LABEL (label), tvm_pango_attr_list_bold ());
+  gtk_frame_set_label_widget (GTK_FRAME (frame), label);
+  gtk_widget_show (label);
+
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 3);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  gtk_container_set_border_width (GTK_CONTAINER (table), 8);
+  gtk_container_add (GTK_CONTAINER (frame), table);
+  gtk_widget_show (table);
+
+  image = gtk_image_new_from_icon_name (gnome-dev-mouse-optical, 
GTK_ICON_SIZE_DIALOG);
+  gtk_misc_set_alignment (GTK_MISC (image), 0.5f, 0.0f);
+  gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 3, GTK_FILL, GTK_FILL, 
0, 0);
+  gtk_widget_show (image);
+
+  button = gtk_check_button_new_with_mnemonic (_(Automatically run a program 
+ when an USB _mouse is 
connected));
+  xfconf_g_property_bind (channel, /automouse/enabled, G_TYPE_BOOLEAN, 
+  button, active);
+  gtk_table_attach (GTK_TABLE (table), button, 1, 2, 0, 1, GTK_EXPAND | 
GTK_FILL,
+GTK_FILL, 0, 0);
+  gtk_widget_show (button);
+
+  entry = tvm_command_entry_new_with_label (_(C_ommand:));
+  xfconf_g_property_bind (channel, /automouse/enabled, G_TYPE_BOOLEAN, 
+  entry, sensitive);
+  xfconf_g_property_bind (channel, /automouse/command, G_TYPE_STRING, 
+  entry, command);
+  gtk_table_attach (GTK_TABLE (table), entry, 1, 2, 1, 2, GTK_EXPAND | 
GTK_FILL,
+

[Xfce4-commits] thunar-volman:master Fix command line option handling (add code for --version).

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 693abb789907d8548ce22bbc8629e3ece1cd8f39 (commit)
   from 3407dce340a7860de244ce2c1957f346482a1b80 (commit)

commit 693abb789907d8548ce22bbc8629e3ece1cd8f39
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 14:33:04 2010 +0200

Fix command line option handling (add code for --version).

 thunar-volman/main.c |   15 ++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/thunar-volman/main.c b/thunar-volman/main.c
index 96f16dd..2943c88 100644
--- a/thunar-volman/main.c
+++ b/thunar-volman/main.c
@@ -105,6 +105,19 @@ main (intargc,
   return EXIT_FAILURE;
 }
 
+  /* check if we should print version information */
+  if (opt_version)
+{
+  g_print (%s %s (Xfce %s)\n\n, PACKAGE_NAME, PACKAGE_VERSION, 
+   xfce_version_string ());
+  g_print (%s\n, Copyright (c) 2004-2007 Benedikt Meurer 
be...@xfce.org);
+  g_print (%s\n, Copyright (c)  2010 Jannis Pohlmann 
jan...@xfce.org);
+  g_print (\n%s\n\n, _(All rights reserved.));
+  g_print (_(Please report bugs to %s.), PACKAGE_BUGREPORT);
+  g_print (\n);
+  return EXIT_SUCCESS;
+}
+
   /* initialize xfconf */
   if (!xfconf_init (error))
 {
@@ -114,7 +127,7 @@ main (intargc,
 }
 
   /* check if we should print the version information */
-  if (opt_version)
+  if (opt_configure)
 {
   /* the --configure/-c option of thunar-volman exists for 
backwards-compatibility
* reasons only. what we really do here is spawning 
thunar-volman-settings */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Improve input device detection. Patch by Nick Schermer.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to fd1d0913716d3b15ef9a4e604f5a81035cd8bc5a (commit)
   from 42276b42a38c551ede3986c37f67ffafb143e7f8 (commit)

commit fd1d0913716d3b15ef9a4e604f5a81035cd8bc5a
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Jul 24 21:45:05 2010 +0200

Improve input device detection. Patch by Nick Schermer.

 thunar-volman/tvm-input-device.c |   17 +
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/thunar-volman/tvm-input-device.c b/thunar-volman/tvm-input-device.c
index ef79b15..1305374 100644
--- a/thunar-volman/tvm-input-device.c
+++ b/thunar-volman/tvm-input-device.c
@@ -37,6 +37,7 @@
 void
 tvm_input_device_added (TvmContext *context)
 {
+  const gchar *devname;
   const gchar *icon;
   const gchar *summary;
   const gchar *message;
@@ -46,6 +47,9 @@ tvm_input_device_added (TvmContext *context)
   const gchar *driver;
   const gchar *enabled_property = NULL;
   const gchar *command_property = NULL;
+  gboolean is_keyboard;
+  gboolean is_mouse;
+  gboolean is_tablet;
   gboolean enabled;
   gchar   *command;
 
@@ -56,8 +60,12 @@ tvm_input_device_added (TvmContext *context)
   id_model = g_udev_device_get_property (context-device, ID_MODEL);
   driver = g_udev_device_get_property (context-device, DRIVER);
   id_usb_driver = g_udev_device_get_property (context-device, 
ID_USB_DRIVER);
+  is_keyboard = g_udev_device_get_property_as_boolean (context-device, 
ID_INPUT_KEYBOARD);
+  is_mouse = g_udev_device_get_property_as_boolean (context-device, 
ID_INPUT_MOUSE);
+  is_tablet = g_udev_device_get_property_as_boolean (context-device, 
ID_INPUT_TABLET);
+  devname = g_udev_device_get_property (context-device, DEVNAME);
 
-  if (g_strcmp0 (id_class, kbd) == 0)
+  if (is_keyboard || g_strcmp0 (id_class, kbd) == 0)
 {
   /* we have a keyboard */
   enabled_property = /autokeyboard/enabled;
@@ -67,7 +75,8 @@ tvm_input_device_added (TvmContext *context)
   summary = _(Keyboard detected);
   message = _(A keyboard was detected);
 }
-  else if (g_strcmp0 (driver, wacom) == 0 
+  else if (is_tablet
+   || g_strcmp0 (driver, wacom) == 0
|| g_strcmp0 (id_usb_driver, wacom) == 0)
 {
   /* we have a wacom tablet */
@@ -78,7 +87,7 @@ tvm_input_device_added (TvmContext *context)
   summary = _(Tablet detected);
   message = _(A graphics tablet was detected);
 }
-  else if (g_strcmp0 (id_class, mouse) == 0)
+  else if (is_mouse || g_strcmp0 (id_class, mouse) == 0)
 {
   if (g_strstr_len (id_model, -1, Tablet) != NULL 
   || g_strstr_len (id_model, -1, TABLET) != NULL
@@ -92,7 +101,7 @@ tvm_input_device_added (TvmContext *context)
   summary = _(Tablet detected);
   message = _(A graphics tablet was detected);
 }
-  else
+  else if (devname == NULL || !g_str_has_prefix (devname, 
/dev/input/event))
 {
   /* we have a normal mouse */
   enabled_property = /automouse/enabled;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Add support for iPods with ID_MEDIA_PLAYER unset.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to f8b4f75b09138d8f112b3dee36f4a248897ea869 (commit)
   from fd1d0913716d3b15ef9a4e604f5a81035cd8bc5a (commit)

commit f8b4f75b09138d8f112b3dee36f4a248897ea869
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sun Jul 25 18:19:29 2010 +0200

Add support for iPods with ID_MEDIA_PLAYER unset.

 thunar-volman/tvm-block-device.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/thunar-volman/tvm-block-device.c b/thunar-volman/tvm-block-device.c
index 77fd287..f29608c 100644
--- a/thunar-volman/tvm-block-device.c
+++ b/thunar-volman/tvm-block-device.c
@@ -201,7 +201,7 @@ tvm_block_device_autoipod (TvmContext *context,
   if (path_dcim != NULL)
 {
   /* ...so we need to prompt what to do */
-  response = tvm_prompt (context, gnome-dev-ipod, _(Photos and 
Music),
+  response = tvm_prompt (context, multimedia-player, _(Photos and 
Music),
  _(Photos were found on your portable music 
player),
  _(Would you like to import the photos or 
manage the 
music?),
@@ -210,7 +210,7 @@ tvm_block_device_autoipod (TvmContext *context,
  _(Manage _Music), TVM_RESPONSE_MUSIC,
  NULL);
 }
-  else if (is_audio_player)
+  else if (is_audio_player || is_ipod)
 {
   response = TVM_RESPONSE_MUSIC;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Add some debug output

[Jannis Pohlmann]

Updating branch refs/heads/master
 to e6833035f20332b23e4e76f3eb96117680628bb8 (commit)
   from 45335a4707272417b3c5fbb28ffe3dd6f4926d1d (commit)

commit e6833035f20332b23e4e76f3eb96117680628bb8
Author: Jannis Pohlmann jan...@xfce.org
Date:   Wed Jul 21 22:55:24 2010 +0200

Add some debug output

 thunar-volman/tvm-usb-device.c |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/thunar-volman/tvm-usb-device.c b/thunar-volman/tvm-usb-device.c
index 943f362..02b1529 100644
--- a/thunar-volman/tvm-usb-device.c
+++ b/thunar-volman/tvm-usb-device.c
@@ -45,17 +45,23 @@ tvm_usb_device_added (TvmContext *context)
 
   g_return_if_fail (context != NULL);
 
+  g_debug (usb device added);
+
   /* collect device information */
   driver = g_udev_device_get_property (context-device, DRIVER);
   is_camera = g_udev_device_get_property_as_boolean (context-device, 
ID_GPHOTO2);
 
   if (is_camera)
 {
+  g_debug (is camera);
+
   enabled_property = /autophoto/enabled;
   command_property = /autophoto/command;
 }
   else if (g_strcmp0 (driver, usblp) == 0)
 {
+  g_debug (is printer);
+
   enabled_property = /autoprinter/enabled;
   command_property = /autoprinter/command;
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Add missing compiler and linker flags for gthread.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to 42276b42a38c551ede3986c37f67ffafb143e7f8 (commit)
   from ec4a642dac6bdf799b868daa41a4c9c43aa2adb4 (commit)

commit 42276b42a38c551ede3986c37f67ffafb143e7f8
Author: Jannis Pohlmann jan...@xfce.org
Date:   Fri Jul 23 10:03:12 2010 +0200

Add missing compiler and linker flags for gthread.

 thunar-volman-settings/Makefile.am |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/thunar-volman-settings/Makefile.am 
b/thunar-volman-settings/Makefile.am
index 296e0e7..4b97bf9 100644
--- a/thunar-volman-settings/Makefile.am
+++ b/thunar-volman-settings/Makefile.am
@@ -41,6 +41,7 @@ thunar_volman_settings_SOURCES =  
\
 thunar_volman_settings_CFLAGS =
\
$(EXO_CFLAGS)   \
$(GLIB_CFLAGS)  \
+   $(GTHREAD_CFLAGS)   \
$(GTK_CFLAGS)   \
$(LIBXFCE4UI_CFLAGS)\
$(LIBXFCE4UTIL_CFLAGS)  \
@@ -54,6 +55,7 @@ thunar_volman_settings_LDFLAGS =  
\
 thunar_volman_settings_LDADD = \
$(EXO_LIBS) \
$(GLIB_LIBS)\
+   $(GTHREAD_LIBS) \
$(GTK_LIBS) \
$(LIBXFCE4UI_LIBS)  \
$(LIBXFCE4UTIL_LIBS)\
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman:master Display detection and mount notifications if libnotify is available.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to ec4a642dac6bdf799b868daa41a4c9c43aa2adb4 (commit)
   from e6833035f20332b23e4e76f3eb96117680628bb8 (commit)

commit ec4a642dac6bdf799b868daa41a4c9c43aa2adb4
Author: Jannis Pohlmann jan...@xfce.org
Date:   Thu Jul 22 13:47:49 2010 +0200

Display detection and mount notifications if libnotify is available.

 configure.in.in|   13 +++-
 thunar-volman/Makefile.am  |   11 +++-
 thunar-volman/main.c   |   23 ++
 thunar-volman/tvm-block-device.c   |   62 ++-
 thunar-volman/tvm-input-device.c   |   23 ++
 thunar-volman/tvm-notify.c |   83 
 thunar-volman/{tvm-input-device.h = tvm-notify.h} |   16 ++--
 thunar-volman/tvm-usb-device.c |   15 
 8 files changed, 234 insertions(+), 12 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 89ba231..2189714 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -91,6 +91,12 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.7.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0])
 
+dnl ***
+dnl *** Optional mount notification support (libnotify) ***
+dnl ***
+XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.4.0], [notifications], 
+   [Notifications support], [yes])
+
 dnl ***
 dnl *** Check for debugging support ***
 dnl ***
@@ -130,5 +136,10 @@ dnl ***
 echo
 echo Build Configuration:
 echo
-echo * Debug Support: $enable_debug
+if test x$LIBNOTIFY_FOUND = xyes; then
+echo * Mount notifications: yes
+else
+echo * Mount notifications: no
+fi
+echo * Debug Support:   $enable_debug
 echo
diff --git a/thunar-volman/Makefile.am b/thunar-volman/Makefile.am
index e64b656..4e9b00b 100644
--- a/thunar-volman/Makefile.am
+++ b/thunar-volman/Makefile.am
@@ -28,6 +28,12 @@ INCLUDES =   
\
 bin_PROGRAMS = \
thunar-volman
 
+if HAVE_LIBNOTIFY
+tvm_notify_sources =   \
+   tvm-notify.c\
+   tvm-notify.h
+endif
+
 thunar_volman_SOURCES =
\
main.c  \
tvm-block-device.c  \
@@ -47,7 +53,8 @@ thunar_volman_SOURCES =   
\
tvm-run.c   \
tvm-run.h   \
tvm-usb-device.c\
-   tvm-usb-device.h
+   tvm-usb-device.h\
+   $(tvm_notify_sources)
 
 thunar_volman_CFLAGS = \
$(DBUS_CFLAGS)  \
@@ -56,6 +63,7 @@ thunar_volman_CFLAGS =
\
$(GTHREAD_CFLAGS)   \
$(GTK_CFLAGS)   \
$(GUDEV_CFLAGS) \
+   $(LIBNOTIFY_CFLAGS) \
$(LIBXFCE4UI_CFLAGS)\
$(LIBXFCE4UTIL_CFLAGS)  \
$(XFCONF_CFLAGS)\
@@ -72,6 +80,7 @@ thunar_volman_LDADD = 
\
$(GTHREAD_LIBS) \
$(GTK_LIBS) \
$(GUDEV_LIBS)   \
+   $(LIBNOTIFY_LIBS)   \
$(LIBXFCE4UI_LIBS)  \
$(LIBXFCE4UTIL_LIBS)\
$(XFCONF_LIBS)
diff --git a/thunar-volman/main.c b/thunar-volman/main.c
index 2943c88..b502059 100644
--- a/thunar-volman/main.c
+++ b/thunar-volman/main.c
@@ -33,6 +33,10 @@
 
 #include gudev/gudev.h
 
+#ifdef HAVE_LIBNOTIFY
+#include libnotify/notify.h
+#endif
+
 #include libxfce4util/libxfce4util.h
 
 #include xfconf/xfconf.h
@@ -97,6 +101,20 @@ main (intargc,
   if (!g_thread_supported ())
 g_thread_init (NULL);
 

[Xfce4-commits] thunar-volman:jannis/port-to-udev Improve input device detection. Patch by Nick Schermer.

[Jannis Pohlmann]

Updating branch refs/heads/jannis/port-to-udev
 to fd1d0913716d3b15ef9a4e604f5a81035cd8bc5a (commit)
   from 42276b42a38c551ede3986c37f67ffafb143e7f8 (commit)

commit fd1d0913716d3b15ef9a4e604f5a81035cd8bc5a
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sat Jul 24 21:45:05 2010 +0200

Improve input device detection. Patch by Nick Schermer.

 thunar-volman/tvm-input-device.c |   17 +
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/thunar-volman/tvm-input-device.c b/thunar-volman/tvm-input-device.c
index ef79b15..1305374 100644
--- a/thunar-volman/tvm-input-device.c
+++ b/thunar-volman/tvm-input-device.c
@@ -37,6 +37,7 @@
 void
 tvm_input_device_added (TvmContext *context)
 {
+  const gchar *devname;
   const gchar *icon;
   const gchar *summary;
   const gchar *message;
@@ -46,6 +47,9 @@ tvm_input_device_added (TvmContext *context)
   const gchar *driver;
   const gchar *enabled_property = NULL;
   const gchar *command_property = NULL;
+  gboolean is_keyboard;
+  gboolean is_mouse;
+  gboolean is_tablet;
   gboolean enabled;
   gchar   *command;
 
@@ -56,8 +60,12 @@ tvm_input_device_added (TvmContext *context)
   id_model = g_udev_device_get_property (context-device, ID_MODEL);
   driver = g_udev_device_get_property (context-device, DRIVER);
   id_usb_driver = g_udev_device_get_property (context-device, 
ID_USB_DRIVER);
+  is_keyboard = g_udev_device_get_property_as_boolean (context-device, 
ID_INPUT_KEYBOARD);
+  is_mouse = g_udev_device_get_property_as_boolean (context-device, 
ID_INPUT_MOUSE);
+  is_tablet = g_udev_device_get_property_as_boolean (context-device, 
ID_INPUT_TABLET);
+  devname = g_udev_device_get_property (context-device, DEVNAME);
 
-  if (g_strcmp0 (id_class, kbd) == 0)
+  if (is_keyboard || g_strcmp0 (id_class, kbd) == 0)
 {
   /* we have a keyboard */
   enabled_property = /autokeyboard/enabled;
@@ -67,7 +75,8 @@ tvm_input_device_added (TvmContext *context)
   summary = _(Keyboard detected);
   message = _(A keyboard was detected);
 }
-  else if (g_strcmp0 (driver, wacom) == 0 
+  else if (is_tablet
+   || g_strcmp0 (driver, wacom) == 0
|| g_strcmp0 (id_usb_driver, wacom) == 0)
 {
   /* we have a wacom tablet */
@@ -78,7 +87,7 @@ tvm_input_device_added (TvmContext *context)
   summary = _(Tablet detected);
   message = _(A graphics tablet was detected);
 }
-  else if (g_strcmp0 (id_class, mouse) == 0)
+  else if (is_mouse || g_strcmp0 (id_class, mouse) == 0)
 {
   if (g_strstr_len (id_model, -1, Tablet) != NULL 
   || g_strstr_len (id_model, -1, TABLET) != NULL
@@ -92,7 +101,7 @@ tvm_input_device_added (TvmContext *context)
   summary = _(Tablet detected);
   message = _(A graphics tablet was detected);
 }
-  else
+  else if (devname == NULL || !g_str_has_prefix (devname, 
/dev/input/event))
 {
   /* we have a normal mouse */
   enabled_property = /automouse/enabled;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] thunar-volman|thunar-volman-0.5.0 Creating annotated tag thunar-volman-0.5.0

[Jannis Pohlmann]

Updating annotated tag refs/tags/thunar-volman-0.5.0
 as new annotated tag
 to 1c0ffcf6b09895c75e6d6797cfdb5e0d7d2fe21e (tag)
   succeeds thunar-volman-0.3.80
  tagged by Jannis Pohlmann jan...@xfce.org
 on 2010-07-25 18:16 +

Alexander Toresson (1):
  thunar-svn-plugin/trunk/po:

Auke Kok (1):
  l10n: Updates to Dutch (Flemish) (nl) translation

Bauzhan Muftakhidinov (2):
  l10n: New translation to Kazakh.
  l10n: Updated Kazakh (kk) translation to 100%

Brian Tarricone (1):
  2008-08-30  Brian Tarricone bj...@cornell.edu

Cristian Marchi (1):
  l10n: Updated Italian (it) translation to 100%

Daniel Nylander (1):
  l10n: Updates to Swedish (sv) translation

Eren Turkay (1):
  Turkish translation update by Samed Beyribey

Evaggelos Balaskas (1):
  l10n: Updated Greek (el) translation to 100%

Gabor Kelemen (3):
  2009-07-23  Gabor Kelemen  kelem...@gnome.hu
  l10n: Updated Hungarian (hu) translation to 100%
  l10n: Updated Hungarian (hu) translation to 100%

Jannis Pohlmann (34):
  * autogen.sh: Add git svn revision versioning support.
  * thunar-volman-settings.desktop.in.in: Remove GenericName and
  Initial work on porting thunar-volman to gudev/GIO.
  Implement video CD/DVD autoplaying.
  Make tvm_file_test() case insensitive so that video_ts equals VIDEO_TS.
  Properly exit when the CD/DVD drive has no media.
  Add support for blank CDs and DVDs by launching the burn software.
  Implement autorun support (requires .autorun, autorun or autorun.sh).
  Add support for opening autorun.exe files with wine.
  Implement autoopen (requires an .autoopen or autoopen file).
  Implement photo import from cameras detected as mass storage devices.
  Add support for USB media players and iPods.
  Add support for keyboards, mice and tablets.
  Add support for wacom volito and bamboo tablets.
  Add support for detecting USB printers.
  Add support for detecting PTP/gphoto2 cameras.
  Fix typo spotted by Linoel Le Folgoc.
  Add function to run the default audio CD player.
  Add support for mixed data/audio and pure audio CDs.
  Initial work on porting thunar-volman-settings to the new code.
  Implement the multimedia tab of thunar-volman-settings again.
  Make the camera tab available again.
  Make the PDA tab available agian. Disabled because unsupported.
  Make the printers page available again.
  Make the input devices tab available again.
  Fix command line option handling (add code for --version).
  Fix path to the thunar-volman-settings executable.
  Add some debug output
  Display detection and mount notifications if libnotify is available.
  Add missing compiler and linker flags for gthread.
  Improve input device detection. Patch by Nick Schermer.
  Add support for iPods with ID_MEDIA_PLAYER unset.
  Detect all devices as iPods whose ID_MODEL is prefixed with iPod.
  Release 0.5.0!

Jari Rahkonen (1):
  Update Finnish translation

Jeff Bailes (1):
  l10n: Updates to English (United Kingdom) (en_GB) translation

Lars Nielsen (1):
  * da.po,LINGUAS: Danish translation added

Leandro Regueiro (1):
  l10n: Updates to Galician (gl) translation

Masato Hashimoto (1):
  * ja.po: Japanese translation update (Masato Hashimoto)

Maximilian Schleiss (10):
  Translations update for id and fr
  Updated Indonesian translation for the xfburn and dict modules
  Translations updates for a lot of languages in a lot of packages
  Translations updates and additions - ca, nb_NO, uk, zh_CN
  Translations updates - es fr
  Translations updates - ca
  Translations updates - es gl id ja uk
  Translations updates - de ca it ja nb pt_PT tr
  Translations updates - fr id it ja nb pl
  Translations updates - es fr gl it tr

Michal Varady (2):
  Czech translation updated and added (it has not been present in LINGUAS 
since first commit)
  Czech translation fixed

Michal Várady (1):
  l10n: Updates to Czech (cs) translation

Mike Massonnet (11):
  Renamed pt_PT to pt and nb_NO to nb (bug #4574)
  Fix the renaming of the pt nb files -- thanks to jerome who noticed this 
problem
  goodies translation update
  goodies translation update (galician only)
  update translations
  update goodies translations
  Drop svn:executable bit from po files
  update translations
  update goodies translations
  update goodies translation
  update goodies translation

Nuno Miguel (1):
  l10n: Updates to Portuguese (pt) translation

Og Maciel (1):
  Updated Brazilian Portuguese translation.

Per Kongstad (1):
  * ru.po, LINGUAS: Russian translation added (Pavel Labushev)

Piarres Beobide (2):
  Basque translation update
  Some goodies Basque translation update

Piotr Sokól (2):
  Updated Polish translations
  

[Xfce4-commits] xfce4-session:master Drop the old 4.6 panel plugin implementation.

[Nick Schermer]

Updating branch refs/heads/master
 to 3c3b6461a08cc3105bcd830a541d814161a2473b (commit)
   from dddf3232a52dd770b0d726e2ce7658e5ac40fe47 (commit)

commit 3c3b6461a08cc3105bcd830a541d814161a2473b
Author: Nick Schermer n...@xfce.org
Date:   Sun Jul 25 20:34:32 2010 +0200

Drop the old 4.6 panel plugin implementation.

Have been a couple of unstable releases of the panel and
the code is mature enough to depend on it in the Xfce core
modules.

 configure.in.in|9 +--
 panel-plugin/Makefile.am   |   93 
 panel-plugin/xfsm-logout-plugin-4.6.desktop.in.in  |7 --
 panel-plugin/xfsm-logout-plugin.c  |4 -
 ...desktop.in.in = xfsm-logout-plugin.desktop.in} |0
 po/POTFILES.in |3 +-
 po/POTFILES.skip   |3 -
 7 files changed, 37 insertions(+), 82 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 471aa16..104bdab 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -81,15 +81,8 @@ XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.73])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.7.0])
 
 dnl we provide a panel plugin now
-XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0],
+XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.7.2],
[panel-plugin], [Panel logout menu button], [yes])
-if test x$LIBXFCE4PANEL_FOUND = xyes; then
-PANEL_MINOR=`echo $LIBXFCE4PANEL_VERSION | cut -d. -f2`
-if test $PANEL_MINOR -lt 7; then
-old_panel_plugin=yes
-fi
-fi
-AM_CONDITIONAL([BUILD_OLD_PANEL_PLUGIN], [test x$old_panel_plugin = xyes])
 
 dnl Check for gnome support
 XDT_CHECK_OPTIONAL_PACKAGE([GNOME], [gconf-2.0], [2.4.0], [gnome],
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 54b..392dce1 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,17 +1,29 @@
-plugin_sources = \
-   xfsm-logout-plugin.c \
+
+INCLUDES = \
+   -I$(top_srcdir) \
+   -DLOCALEDIR=\$(localedir)\ \
+   -DG_LOG_DOMAIN=\libxfsm-logout-plugin\
+
+plugindir = $(libdir)/xfce4/panel-plugins
+
+plugin_LTLIBRARIES = libxfsm-logout-plugin.la
+
+libxfsm_logout_plugin_built_sources = \
xfsm-logout-plugin-ui.h
 
-plugin_cflags = \
+libxfsm_logout_plugin_la_SOURCES = \
+   $(libxfsm_logout_plugin_built_sources) \
+   xfsm-logout-plugin.c
+
+libxfsm_logout_plugin_la_CFLAGS = \
$(LIBX11_CFLAGS) \
$(LIBXFCE4PANEL_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
$(LIBXFCE4UI_CFLAGS) \
$(GTK_CFLAGS) \
-   $(DBUS_GLIB_CFLAGS) \
-   -DLOCALEDIR=\$(localedir)\
+   $(DBUS_GLIB_CFLAGS)
 
-plugin_libs = \
+libxfsm_logout_plugin_la_LIBADD = \
$(LIBX11_LIBS) \
$(LIBXFCE4PANEL_LIBS) \
$(LIBXFCE4UTIL_LIBS) \
@@ -19,71 +31,36 @@ plugin_libs = \
$(GTK_LIBS) \
$(DBUS_GLIB_LIBS)
 
-if BUILD_OLD_PANEL_PLUGIN
-
-plugindir = $(libexecdir)/xfce4/panel-plugins
-plugin_PROGRAMS = xfsm-logout-plugin
-
-xfsm_logout_plugin_SOURCES = $(plugin_sources)
-xfsm_logout_plugin_CFLAGS = $(plugin_cflags)
-xfsm_logout_plugin_LDADD = $(plugin_libs)
-
-else
-
-plugindir = $(libdir)/xfce4/panel-plugins
-plugin_LTLIBRARIES = libxfsm-logout-plugin.la
-
-libxfsm_logout_plugin_la_SOURCES = $(plugin_sources)
-libxfsm_logout_plugin_la_CFLAGS = $(plugin_cflags)
-libxfsm_logout_plugin_la_LIBADD = $(plugin_libs)
 libxfsm_logout_plugin_la_LDFLAGS = \
-avoid-version \
-   -export-dynamic \
-module \
-   -shared
+   -no-undefined \
+   -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)'
 
-endif
-
-# .desktop file
 #
-# Some automake trickery here. Because we cannot use $(libexecdir) in the
-# automake stage, we'll use sed to get the full path into the .desktop file.
-# We also need to let intltool merge the translated fields, so we add an
-# additional level of indirection: a name.desktop.in.in file.
+# .desktop file
 #
-if BUILD_OLD_PANEL_PLUGIN
-dfile = xfsm-logout-plugin-4.6.desktop.in.in
-else
-dfile = xfsm-logout-plugin.desktop.in.in
-endif
-
-desktop_in_in_files = $(dfile)
-desktop_in_files = xfsm-logout-plugin.desktop.in
-
 desktopdir = $(datadir)/xfce4/panel-plugins
+desktop_in_files = xfsm-logout-plugin.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
-# get full path into .desktop file
-xfsm-logout-plugin.desktop.in: $(srcdir)/$(dfile)
-   sed -e s,\...@plugindir\@,$(plugindir), $  $@
-
-if MAINTAINER_MODE
+EXTRA_DIST = \
+   xfsm-logout-plugin-ui.xml \
+   $(desktop_in_files)
 
-xfsm-logout-plugin-ui.h: $(srcdir)/xfsm-logout-plugin-ui.xml Makefile
-   $(AM_V_GEN) exo-csource --static --name=logout_plugin_ui $  $@
+DISTCLEANFILES = \
+   $(desktop_DATA)
 
-BUILT_SOURCES = xfsm-logout-plugin-ui.h
+if MAINTAINER_MODE
+BUILT_SOURCES = \

[Xfce4-commits] thunar|thunar-1.1.1 Creating annotated tag thunar-1.1.1

[Jannis Pohlmann]

Updating annotated tag refs/tags/thunar-1.1.1
 as new annotated tag
 to 47c1b6a5444ed71cd2139cb315cb6b5f407da68a (tag)
   succeeds thunar-1.1.0
  tagged by Jannis Pohlmann jan...@xfce.org
 on 2010-07-25 20:52 +

Abel Martín (4):
  l10n: Updated Spanish (Castilian) (es) translation to 100%
  l10n: Updated Spanish (Castilian) (es) translation to 77%
  l10n: Updated Spanish (Castilian) (es) translation to 81%
  l10n: Updated Spanish (Castilian) (es) translation to 100%

Andhika Padmawan (1):
  l10n: Updated Indonesian (id) translation to 100%

Ayhan YALÇINSOY (1):
  l10n: Updated Turkish (tr) translation to 99%

Bauzhan Muftakhidinov (6):
  l10n: Updated Kazakh (kk) translation to 100%
  l10n: Updated Kazakh (kk) translation to 100%
  l10n: Updated Kazakh (kk) translation to 100%
  l10n: Updated Kazakh (kk) translation to 100%
  l10n: Updated Kazakh (kk) translation to 100%
  l10n: Updated Kazakh (kk) translation to 100%

Cheng-Chia Tseng (1):
  l10n: Updated Chinese (Taiwan) (zh_TW) translation to 96%

Cristian Marchi (3):
  l10n: Updated Italian (it) translation to 100%
  l10n: Updated Italian (it) translation to 100%
  l10n: Updated Italian (it) translation to 100%

Danishka Navin (8):
  l10n: Added Sinhala (si) translation
  l10n: Updated Sinhala (si) translation to 0%
  l10n: Updated Sinhala (si) translation to 0%
  l10n: Updated Sinhala (si) translation to 2%
  l10n: Updated Sinhala (si) translation to 4%
  l10n: Updated Sinhala (si) translation to 4%
  l10n: Updated Sinhala (si) translation to 5%
  l10n: Updated Sinhala (si) translation to 5%

Denis Koryavov (2):
  l10n: Updated Russian (ru) translation to 100%
  l10n: Updated Russian (ru) translation to 48%

Dmitrij Smirnov (4):
  l10n: Updated Russian (ru) translation to 41%
  l10n: Updated Russian (ru) translation to 42%
  l10n: Updated Russian (ru) translation to 43%
  l10n: Updated Russian (ru) translation to 46%

Dmitry Nikitin (2):
  l10n: Updated Ukrainian (uk) translation to 97%
  l10n: Updated Ukrainian (uk) translation to 100%

Evaggelos Balaskas (1):
  l10n: Updated Greek (el) translation to 100%

Gheyret Kenji (2):
  l10n: Uyghur translation
  l10n: Uyghur translation

Ivica  Kolić (15):
  l10n: Updates to Croatian (hr) translation
  l10n: Updated Croatian (hr) translation to 42%
  l10n: Updated Croatian (hr) translation to 47%
  l10n: Updated Croatian (hr) translation to 49%
  l10n: Updated Croatian (hr) translation to 51%
  l10n: Updated Croatian (hr) translation to 53%
  l10n: Updated Croatian (hr) translation to 54%
  l10n: Updated Croatian (hr) translation to 56%
  l10n: Updates to Croatian (hr) translation
  l10n: Updates to Croatian (hr) translation
  l10n: Updated Croatian (hr) translation to 69%
  l10n: Updated Croatian (hr) translation to 74%
  l10n: Updated Croatian (hr) translation to 77%
  l10n: Updated Croatian (hr) translation to 77%
  l10n: Updates to Croatian (hr)translation

Jamil Ahmed (4):
  l10n: Added Bengali translation.
  l10n: Added Bengali translation.
  l10n: Updated Bengali (bn) translation to 100%
  l10n: Updated Bengali translation.

Jannis Pohlmann (20):
  Post-release version bump.
  Use stock icons and standard icon names where appropriate (bug #6133).
  Properly update the cursor when a row is deleted in (bug #5361).
  Refilter the tree model when a hidden dir is entered/left (bug #6142).
  Fix typo in the comment.
  Fix sorting by type in ThunarListModel (bug #6143). Fix memleaks.
  Synchronize ThunarListModel sorting with detailed list view captions.
  Fix browsing shortcuts and mountables in ThunarLauncher.
  Change CWD before spawning applications in ThunarLauncher.
  Use GUDev and sysfs paths to spawn thunar-volman on udev events.
  Also react on undev change events.
  Don't react to udev change events for now. They are a little weird.
  React on change events of CD drives if they have media available.
  Copy exo-mount-notify-1 over to thunar (as thunar-mount-notify-1).
  Add thunar-mount-notify/main.c to POTFILES.in.
  Fix the application name in certain strings.
  Re-implement mount/eject notifications based on libnotify.
  Use drive-removable-media as a fallback icon for notifications.
  Listen to udev events for the usb subsystem.
  Release 1.1.1!

Jari Rahkonen (1):
  l10n: Updated Finnish (fi) translation to 100%

Johannes Lips (1):
  l10n: Updated German (de) translation to 93%

Leandro Regueiro (2):
  l10n: Updated Galician (gl) translation to 100%
  l10n: Updated Galician (gl) translation to 97%

Maximilian Schleiss (1):
  l10n: Updated French (fr) translation to 100%

Michal Várady (1):
  l10n: Updated Czech (cs) translation to 100%

Mike Massonnet (3):

[Xfce4-commits] thunar:master Add git version tag again.

[Jannis Pohlmann]

Updating branch refs/heads/master
 to efde4bd436949560982d9132ea9f77c4d8b0d585 (commit)
   from 1f5aadccac537a59956cdf1d677941965255d2c8 (commit)

commit efde4bd436949560982d9132ea9f77c4d8b0d585
Author: Jannis Pohlmann jan...@xfce.org
Date:   Sun Jul 25 23:06:26 2010 +0200

Add git version tag again.

 configure.in.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index e0ce2e3..fcc6d19 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -28,7 +28,7 @@ m4_define([thunar_version_minor], [1])
 m4_define([thunar_version_micro], [1])
 m4_define([thunar_version_nano], [])
 m4_define([thunar_version_build], [...@revision@])
-m4_define([thunar_version_tag], [])
+m4_define([thunar_version_tag], [git])
 m4_define([thunar_version], 
[thunar_version_major().thunar_version_minor().thunar_version_micro()ifelse(thunar_version_nano(),
 [], [], [.thunar_version_nano()])ifelse(thunar_version_tag(), [git], 
[thunar_version_tag()-thunar_version_build()], [thunar_version_tag()])])
 
 dnl ***
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits