[Xfce4-commits] r22854 - in xarchiver/trunk: po src
Author: colossus Date: 2006-08-23 11:44:38 + (Wed, 23 Aug 2006) New Revision: 22854 Modified: xarchiver/trunk/po/xarchiver.pot xarchiver/trunk/src/extract_dialog.c Log: Updated extract window title when opening a compressed bzip2/gzip file. Updated xarchiver.pot. Modified: xarchiver/trunk/po/xarchiver.pot === --- xarchiver/trunk/po/xarchiver.pot2006-08-23 11:38:59 UTC (rev 22853) +++ xarchiver/trunk/po/xarchiver.pot2006-08-23 11:44:38 UTC (rev 22854) @@ -8,7 +8,7 @@ msgstr Project-Id-Version: PACKAGE VERSION\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-08-22 10:14+0200\n +POT-Creation-Date: 2006-08-23 13:47+0200\n PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n Last-Translator: FULL NAME [EMAIL PROTECTED]\n Language-Team: LANGUAGE [EMAIL PROTECTED]\n @@ -16,8 +16,8 @@ Content-Type: text/plain; charset=CHARSET\n Content-Transfer-Encoding: 8bit\n -#: src/7zip.c:36 src/arj.c:37 src/bzip2.c:60 src/gzip.c:53 src/iso.c:676 -#: src/rar.c:36 src/rpm.c:54 src/tar.c:48 src/zip.c:36 +#: src/7zip.c:36 src/arj.c:37 src/bzip2.c:56 src/gzip.c:53 src/iso.c:676 +#: src/rar.c:36 src/rpm.c:55 src/tar.c:48 src/zip.c:36 msgid Filename msgstr @@ -33,12 +33,12 @@ msgid Attr msgstr -#: src/7zip.c:36 src/arj.c:37 src/bzip2.c:60 src/gzip.c:53 src/rar.c:36 +#: src/7zip.c:36 src/arj.c:37 src/bzip2.c:56 src/gzip.c:53 src/rar.c:36 #: src/tar.c:48 src/zip.c:36 msgid Time msgstr -#: src/7zip.c:36 src/arj.c:37 src/bzip2.c:60 src/gzip.c:53 src/iso.c:676 +#: src/7zip.c:36 src/arj.c:37 src/bzip2.c:56 src/gzip.c:53 src/iso.c:676 #: src/rar.c:36 src/tar.c:48 src/zip.c:36 msgid Date msgstr @@ -63,266 +63,254 @@ msgid Can't run the archiver executable: msgstr -#: src/bzip2.c:60 src/gzip.c:53 src/rar.c:36 src/tar.c:48 +#: src/bzip2.c:56 src/gzip.c:53 src/rar.c:36 src/tar.c:48 msgid Permissions msgstr -#: src/bzip2.c:60 src/gzip.c:53 src/rpm.c:54 src/tar.c:48 +#: src/bzip2.c:56 src/gzip.c:53 src/rpm.c:55 src/tar.c:48 msgid Symbolic Link msgstr -#: src/bzip2.c:60 src/gzip.c:53 src/tar.c:48 +#: src/bzip2.c:56 src/gzip.c:53 src/tar.c:48 msgid Owner/Group msgstr -#: src/bzip2.c:60 src/gzip.c:53 src/iso.c:676 src/rpm.c:54 src/tar.c:48 +#: src/bzip2.c:56 src/gzip.c:53 src/iso.c:676 src/rpm.c:55 src/tar.c:48 msgid Size msgstr -#: src/bzip2.c:102 +#: src/bzip2.c:97 #, c-format msgid Extracting gzip file to %s msgstr -#: src/bzip2.c:104 +#: src/bzip2.c:99 #, c-format msgid Extracting bzip2 file to %s msgstr -#: src/bzip2.c:111 -msgid Can't write file: -msgstr - -#: src/bzip2.c:121 +#: src/bzip2.c:151 msgid You missed the extraction path! msgstr -#: src/bzip2.c:139 src/callbacks.c:97 +#: src/bzip2.c:165 src/callbacks.c:89 msgid Operation canceled. msgstr -#: src/bzip2.c:151 -msgid Can't write to /tmp: -msgstr - -#: src/bzip2.c:182 +#: src/bzip2.c:179 #, c-format msgid Decompressing tar file with %s, please wait... msgstr -#: src/bzip2.c:261 +#: src/bzip2.c:258 #, c-format msgid Recompressing tar file with %s, please wait... msgstr -#: src/bzip2.c:343 src/rpm.c:206 -msgid An error occurred: -msgstr - -#: src/callbacks.c:101 +#: src/callbacks.c:92 #, c-format msgid Please check \%s\ since some files could have been already extracted. msgstr -#: src/callbacks.c:123 src/callbacks.c:1548 +#: src/callbacks.c:111 src/callbacks.c:1534 msgid An error occurred while accessing the archive. msgstr -#: src/callbacks.c:123 src/callbacks.c:1548 src/rpm.c:150 +#: src/callbacks.c:111 src/callbacks.c:1534 src/rpm.c:151 msgid Do you want to open the error messages window? msgstr -#: src/callbacks.c:133 src/callbacks.c:1264 src/callbacks.c:1553 -#: src/callbacks.c:1767 src/extract_dialog.c:823 src/rpm.c:118 src/rpm.c:147 +#: src/callbacks.c:121 src/callbacks.c:1250 src/callbacks.c:1539 +#: src/callbacks.c:1758 src/extract_dialog.c:826 src/rpm.c:119 src/rpm.c:148 msgid Operation failed. msgstr -#: src/callbacks.c:146 src/callbacks.c:1270 src/extract_dialog.c:515 -#: src/extract_dialog.c:702 src/iso.c:797 +#: src/callbacks.c:134 src/callbacks.c:1256 src/extract_dialog.c:518 +#: src/extract_dialog.c:705 src/iso.c:797 msgid Operation completed. msgstr -#: src/callbacks.c:149 +#: src/callbacks.c:137 msgid Please wait while the content of the archive is being updated... msgstr -#: src/callbacks.c:197 +#: src/callbacks.c:185 msgid Operation successfully completed. msgstr -#: src/callbacks.c:216 +#: src/callbacks.c:204 #, c-format msgid The archive \%s\ already exists! msgstr -#: src/callbacks.c:222 +#: src/callbacks.c:210 msgid Do you want to overwrite it? msgstr -#: src/callbacks.c:252 +#: src/callbacks.c:240 msgid Choose Add File to create the compressed file. msgstr -#: src/callbacks.c:256 +#: src/callbacks.c:244 msgid Choose Add to begin creating the archive. msgstr -#: src/callbacks.c:308 +#: src/callbacks.c:296 #, c-format msgid Can't open
[Xfce4-commits] r22858 - xfwm4/trunk/src
Author: olivier
Date: 2006-08-23 19:08:29 + (Wed, 23 Aug 2006)
New Revision: 22858
Modified:
xfwm4/trunk/src/client.c
xfwm4/trunk/src/compositor.c
xfwm4/trunk/src/compositor.h
Log:
Spot and fix an issue with stacking reordering.
Modified: xfwm4/trunk/src/client.c
===
--- xfwm4/trunk/src/client.c2006-08-23 15:10:05 UTC (rev 22857)
+++ xfwm4/trunk/src/client.c2006-08-23 19:08:29 UTC (rev 22858)
@@ -1883,7 +1883,7 @@
display_info = screen_info-display_info;
clientRemoveFromList (c);
-compositorRemoveWindow (display_info, c-frame);
+compositorSetClient (display_info, c-frame, NULL);
myDisplayGrabServer (display_info);
gdk_error_trap_push ();
Modified: xfwm4/trunk/src/compositor.c
===
--- xfwm4/trunk/src/compositor.c2006-08-23 15:10:05 UTC (rev 22857)
+++ xfwm4/trunk/src/compositor.c2006-08-23 19:08:29 UTC (rev 22858)
@@ -1953,8 +1953,17 @@
previous_above = ncw-id;
}
-if (previous_above != above)
+/* If above is set to None, the window whose state was changed is on
+ * the bottom of the stack with respect to sibling.
+ */
+if (above == None)
{
+/* Insert at bottom of window stack */
+screen_info-cwindows = g_list_delete_link (screen_info-cwindows,
sibling);
+screen_info-cwindows = g_list_append (screen_info-cwindows, cw);
+}
+else if (previous_above != above)
+{
GList *index;
for (index = screen_info-cwindows; index; index = g_list_next (index))
@@ -1971,22 +1980,6 @@
screen_info-cwindows = g_list_delete_link (screen_info-cwindows,
sibling);
screen_info-cwindows = g_list_insert_before
(screen_info-cwindows, index, cw);
}
-else if (above == None)
-{
- /* If above is set to None, the window whose state was changed is
on
-* the bottom of the stack with respect to sibling.
-* = Insert at bottom of window stack
-*/
-screen_info-cwindows = g_list_delete_link (screen_info-cwindows,
sibling);
-screen_info-cwindows = g_list_append (screen_info-cwindows, cw);
-}
-else
-{
-/* Don't know what to do */
-g_warning (The window 0x%lx has not been restacked\n
- because the specified sibling 0x%lx was
- not found in our stack, cw-id, above);
-}
}
}
@@ -2447,18 +2440,50 @@
}
cw = find_cwindow_in_display (display_info, id);
-if (cw)
+if (!compositorSetClient (display_info, id, c))
{
-/*
- * The compositor window is already known, just update the client...
- */
-cw-c = c;
+add_win (display_info, id, c);
}
-else
+#endif /* HAVE_COMPOSITOR */
+}
+
+gboolean
+compositorSetClient (DisplayInfo *display_info, Window id, Client *c)
+{
+#ifdef HAVE_COMPOSITOR
+CWindow *cw;
+
+g_return_val_if_fail (display_info != NULL, FALSE);
+g_return_val_if_fail (id != None, FALSE);
+TRACE (entering compositorSetClient: 0x%lx, id);
+
+if (!compositorIsUsable (display_info))
{
-add_win (display_info, id, c);
+return FALSE;
}
+
+cw = find_cwindow_in_display (display_info, id);
+if (cw)
+{
+if (cw-c != c)
+{
+if (WIN_IS_VISIBLE(cw))
+{
+damage_win (cw);
+}
+
+if (cw-extents)
+{
+XFixesDestroyRegion (display_info-dpy, cw-extents);
+cw-extents = None;
+}
+
+cw-c = c;
+}
+return TRUE;
+}
#endif /* HAVE_COMPOSITOR */
+return FALSE;
}
void
Modified: xfwm4/trunk/src/compositor.h
===
--- xfwm4/trunk/src/compositor.h2006-08-23 15:10:05 UTC (rev 22857)
+++ xfwm4/trunk/src/compositor.h2006-08-23 19:08:29 UTC (rev 22858)
@@ -36,9 +36,11 @@
void compositorAddWindow (DisplayInfo *,
Window,
Client *);
+gboolean compositorSetClient (DisplayInfo *,
+ Window,
+ Client *);
void compositorRemoveWindow (DisplayInfo *,
Window);
-
void compositorHandleEvent(DisplayInfo *,
XEvent *);
void compositorInitDisplay(DisplayInfo *);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22860 - xfwm4/trunk/src
Author: olivier Date: 2006-08-23 21:59:42 + (Wed, 23 Aug 2006) New Revision: 22860 Modified: xfwm4/trunk/src/compositor.c Log: Modified: xfwm4/trunk/src/compositor.c === --- xfwm4/trunk/src/compositor.c2006-08-23 21:56:45 UTC (rev 22859) +++ xfwm4/trunk/src/compositor.c2006-08-23 21:59:42 UTC (rev 22860) @@ -82,6 +82,7 @@ #define WIN_IS_VISIBLE(cw) (WIN_IS_VIEWABLE(cw) WIN_HAS_DAMAGE(cw)) #define WIN_IS_DAMAGED(cw) (cw-damaged) #define WIN_IS_REDIRECTED(cw) (cw-redirected) + #define USE_IDLE_REPAINT typedef struct _CWindow CWindow; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22864 - xfdesktop/trunk/src
Author: kelnos
Date: 2006-08-24 00:48:32 + (Thu, 24 Aug 2006)
New Revision: 22864
Modified:
xfdesktop/trunk/src/xfdesktop-file-icon-manager.c
Log:
temp fix for crashes when dropping external files on special icons and
removable volumes
Modified: xfdesktop/trunk/src/xfdesktop-file-icon-manager.c
===
--- xfdesktop/trunk/src/xfdesktop-file-icon-manager.c 2006-08-24 00:01:59 UTC
(rev 22863)
+++ xfdesktop/trunk/src/xfdesktop-file-icon-manager.c 2006-08-24 00:48:32 UTC
(rev 22864)
@@ -2852,8 +2852,26 @@
GList *dest_path_list = NULL, *l;
const gchar *name;
ThunarVfsPath *base_dest_path, *dest_path;
+/* FIXME: icky special-case hacks */
+gboolean dest_is_volume = (drop_icon
+
XFDESKTOP_IS_VOLUME_ICON(drop_icon));
+gboolean dest_is_special = (drop_icon
+
XFDESKTOP_IS_SPECIAL_FILE_ICON(drop_icon));
+gboolean dest_is_trash = (dest_is_special
+ XFDESKTOP_SPECIAL_FILE_ICON_TRASH
+ ==
xfdesktop_special_file_icon_get_icon_type(XFDESKTOP_SPECIAL_FILE_ICON(drop_icon)));
-if(tinfo tinfo-type == THUNAR_VFS_FILE_TYPE_DIRECTORY) {
+/* if it's a volume, but we don't have |tinfo|, this just isn't
+ * going to work */
+if(!tinfo dest_is_volume) {
+thunar_vfs_path_list_free(path_list);
+gtk_drag_finish(context, FALSE, FALSE, time);
+return;
+}
+
+if(tinfo (dest_is_special || dest_is_volume))
+base_dest_path = thunar_vfs_path_ref(tinfo-path);
+else if(tinfo tinfo-type ==
THUNAR_VFS_FILE_TYPE_DIRECTORY) {
base_dest_path =
thunar_vfs_path_relative(fmanager-priv-folder,
thunar_vfs_path_get_name(tinfo-path));
} else
@@ -2868,9 +2886,9 @@
thunar_vfs_path_unref(base_dest_path);
dest_path_list = g_list_reverse(dest_path_list);
-if(context-suggested_action == GDK_ACTION_LINK)
+if(context-suggested_action == GDK_ACTION_LINK
!dest_is_trash)
job = thunar_vfs_link_files(path_list, dest_path_list,
NULL);
-else if(copy_only)
+else if(copy_only !dest_is_trash)
job = thunar_vfs_copy_files(path_list, dest_path_list,
NULL);
else
job = thunar_vfs_move_files(path_list, dest_path_list,
NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
