[Xfce4-commits] r27250 - libxfce4menu/trunk
Author: jannis Date: 2008-07-09 22:23:53 + (Wed, 09 Jul 2008) New Revision: 27250 Modified: libxfce4menu/trunk/ChangeLog libxfce4menu/trunk/autogen.sh Log: * autogen.sh: Fix @REVISION@ substitution when using git svn. Modified: libxfce4menu/trunk/ChangeLog === --- libxfce4menu/trunk/ChangeLog2008-07-09 22:23:24 UTC (rev 27249) +++ libxfce4menu/trunk/ChangeLog2008-07-09 22:23:53 UTC (rev 27250) @@ -1,3 +1,7 @@ +2008-07-10 Jannis Pohlmann <[EMAIL PROTECTED]> + + * autogen.sh: Fix @REVISION@ substitution when using git svn. + 2008-07-06 Jannis Pohlmann <[EMAIL PROTECTED]> * libxfce4menu/xfce-menu.c: Add #if 0 around Modified: libxfce4menu/trunk/autogen.sh === --- libxfce4menu/trunk/autogen.sh 2008-07-09 22:23:24 UTC (rev 27249) +++ libxfce4menu/trunk/autogen.sh 2008-07-09 22:23:53 UTC (rev 27250) @@ -31,7 +31,12 @@ # Substitute revision and linguas linguas=`sed -e '/^#/d' po/LINGUAS` -revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'` +if test -d .git/svn; then + revision=`LC_ALL=C git svn find-rev HEAD` +else + revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", +$2}'` +fi sed -e "s/@LINGUAS@/${linguas}/g" \ -e "s/@REVISION@/${revision}/g" \ < "configure.in.in" > "configure.in" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27248 - xfconf/trunk
Author: jannis Date: 2008-07-09 22:22:23 + (Wed, 09 Jul 2008) New Revision: 27248 Modified: xfconf/trunk/ChangeLog xfconf/trunk/autogen.sh Log: * autogen.sh: Fix @REVISION@ substitution when using git svn. Modified: xfconf/trunk/ChangeLog === --- xfconf/trunk/ChangeLog 2008-07-09 21:58:34 UTC (rev 27247) +++ xfconf/trunk/ChangeLog 2008-07-09 22:22:23 UTC (rev 27248) @@ -1,3 +1,7 @@ +2008-07-10 Jannis Pohlmann <[EMAIL PROTECTED]> + + * autogen.sh: Fix @REVISION@ substitution when using git svn. + 2008-07-05 Jannis Pohlmann <[EMAIL PROTECTED]> * xfconf/xfconf-channel.c: Disconnect from 'PropertyRemoved' signal Modified: xfconf/trunk/autogen.sh === --- xfconf/trunk/autogen.sh 2008-07-09 21:58:34 UTC (rev 27247) +++ xfconf/trunk/autogen.sh 2008-07-09 22:22:23 UTC (rev 27248) @@ -35,7 +35,7 @@ # substitute revision and linguas linguas=$(sed -e '/^#/d' po/LINGUAS) if [ -d .git/svn ]; then -revision=$(git-svn find-rev trunk) +revision=$(git svn find-rev HEAD) elif [ -d .svn ]; then revision=$(LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}') else ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27249 - xfce4-panel/trunk
Author: jannis Date: 2008-07-09 22:23:24 + (Wed, 09 Jul 2008) New Revision: 27249 Modified: xfce4-panel/trunk/autogen.sh Log: I guess this is better. Modified: xfce4-panel/trunk/autogen.sh === --- xfce4-panel/trunk/autogen.sh2008-07-09 22:22:23 UTC (rev 27248) +++ xfce4-panel/trunk/autogen.sh2008-07-09 22:23:24 UTC (rev 27249) @@ -30,7 +30,7 @@ # substitute revision and linguas linguas=`sed -e '/^#/d' po/LINGUAS` if test -d .git/svn; then - revision=`LC_ALL=C git svn find-rev master` + revision=`LC_ALL=C git svn find-rev HEAD` else revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'` ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27247 - xfce4-panel/trunk
Author: jannis Date: 2008-07-09 21:58:34 + (Wed, 09 Jul 2008) New Revision: 27247 Modified: xfce4-panel/trunk/ChangeLog xfce4-panel/trunk/autogen.sh Log: * autogen.sh: Fix @REVISION@ subsitution when using git svn. Modified: xfce4-panel/trunk/ChangeLog === --- xfce4-panel/trunk/ChangeLog 2008-07-09 20:24:51 UTC (rev 27246) +++ xfce4-panel/trunk/ChangeLog 2008-07-09 21:58:34 UTC (rev 27247) @@ -1,3 +1,7 @@ +2008-07-09 23:57 jannis + + * autogen.sh: Fix @REVISION@ subsitution when using git svn. + 2008-01-14 02:08 jannis * configure.in.in: Fix debugging support for SVN snapshots. Until now Modified: xfce4-panel/trunk/autogen.sh === --- xfce4-panel/trunk/autogen.sh2008-07-09 20:24:51 UTC (rev 27246) +++ xfce4-panel/trunk/autogen.sh2008-07-09 21:58:34 UTC (rev 27247) @@ -30,7 +30,7 @@ # substitute revision and linguas linguas=`sed -e '/^#/d' po/LINGUAS` if test -d .git/svn; then - revision=`LC_ALL=C git-svn find-rev trunk` + revision=`LC_ALL=C git svn find-rev master` else revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'` ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27246 - xarchiver/trunk/src
Author: colossus Date: 2008-07-09 20:24:51 + (Wed, 09 Jul 2008) New Revision: 27246 Modified: xarchiver/trunk/src/pref_dialog.c Log: Fixed no icon for the archive item in preferences dialog. Thanks to Enrico Troeger for providing the patch. Modified: xarchiver/trunk/src/pref_dialog.c === --- xarchiver/trunk/src/pref_dialog.c 2008-07-09 12:56:02 UTC (rev 27245) +++ xarchiver/trunk/src/pref_dialog.c 2008-07-09 20:24:51 UTC (rev 27246) @@ -51,7 +51,7 @@ prefs_data->prefs_liststore = gtk_list_store_new (3,GDK_TYPE_PIXBUF,G_TYPE_STRING,G_TYPE_UINT); gtk_list_store_append (prefs_data->prefs_liststore,&iter); - gchar *pixbuf_file = g_strconcat(DATADIR,"/pixmaps/xarchiver-behaviour.svg",NULL); + gchar *pixbuf_file = g_strconcat(DATADIR,"/pixmaps/xarchiver/xarchiver-behaviour.svg",NULL); icon_pixbuf = gdk_pixbuf_new_from_file (pixbuf_file,NULL); g_free (pixbuf_file); gtk_list_store_set (prefs_data->prefs_liststore, &iter, 0, icon_pixbuf, 1, _("Archive"),2,0,-1); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27245 - xarchiver/trunk/src
Author: colossus Date: 2008-07-09 12:56:02 + (Wed, 09 Jul 2008) New Revision: 27245 Modified: xarchiver/trunk/src/archive.c xarchiver/trunk/src/archive.h xarchiver/trunk/src/extract_dialog.c xarchiver/trunk/src/interface.c xarchiver/trunk/src/interface.h xarchiver/trunk/src/main.c xarchiver/trunk/src/rar.c xarchiver/trunk/src/rpm.c xarchiver/trunk/src/string_utils.c xarchiver/trunk/src/string_utils.h xarchiver/trunk/src/window.c xarchiver/trunk/src/window.h Log: Moved xa_update_window_with_archive_entries() to window.c from archive.c Made the current selected sidepane row to be unselected when the user navigates to the root entry. Made the sidepane row to expand when clicked on it. Made the menu entry "Save As" in xa_set_button_state(). Removed unused parameter XArchive* from xa_escape_filenames() in string_utils.c Modified: xarchiver/trunk/src/archive.c === --- xarchiver/trunk/src/archive.c 2008-07-09 10:04:28 UTC (rev 27244) +++ xarchiver/trunk/src/archive.c 2008-07-09 12:56:02 UTC (rev 27245) @@ -20,7 +20,6 @@ #include #include "config.h" #include "archive.h" -#include "mime.h" #include "support.h" #include "window.h" @@ -76,7 +75,7 @@ g_error_free (error); g_strfreev ( argv ); archive->child_pid = 0; - xa_set_button_state (1,1,1,archive->can_add,archive->can_extract,archive->has_sfx,archive->has_test,archive->has_properties); + xa_set_button_state (1,1,1,1,archive->can_add,archive->can_extract,archive->has_sfx,archive->has_test,archive->has_properties); return; } g_strfreev ( argv ); @@ -524,107 +523,6 @@ return entry->columns; } -void xa_update_window_with_archive_entries (XArchive *archive,XEntry *entry) -{ - GdkPixbuf *pixbuf = NULL; - GtkTreeIter iter; - GtkTreeIter *last_dir_iter = NULL; - unsigned short int i; - gpointer current_column; - - archive->current_entry = entry; - if (entry == NULL) - { - entry = archive->root_entry->child; - gtk_entry_set_text(GTK_ENTRY(location_entry),"\0"); - if (archive->location_entry_path != NULL) - { - g_free(archive->location_entry_path); - archive->location_entry_path = NULL; - } - gtk_widget_set_sensitive(back_button,FALSE); - gtk_widget_set_sensitive(up_button,FALSE); - gtk_widget_set_sensitive(home_button,FALSE); - } - else - { - if (archive->location_entry_path != NULL) - { - g_free(archive->location_entry_path); - archive->location_entry_path = NULL; - } - gtk_widget_set_sensitive(back_button,TRUE); - gtk_widget_set_sensitive(up_button,TRUE); - gtk_widget_set_sensitive(home_button,TRUE); - archive->location_entry_path = xa_build_full_path_name_from_entry(entry); - gtk_entry_set_text(GTK_ENTRY(location_entry),archive->location_entry_path); - entry = entry->child; - } - gtk_list_store_clear(archive->liststore); - - while (entry) - { - current_column = entry->columns; - //gtk_list_store_append (archive->liststore, &iter); - if (entry->is_dir) - { - if (last_dir_iter == NULL) - gtk_list_store_prepend(archive->liststore, &iter); - else - { - gtk_list_store_insert_after(archive->liststore, &iter, last_dir_iter); - gtk_tree_iter_free(last_dir_iter); - } - last_dir_iter = gtk_tree_iter_copy(&iter); - } - else - gtk_list_store_append(archive->liststore, &iter); - - if(!g_utf8_validate(entry->filename, -1, NULL) ) - { - gchar *dummy = g_convert(entry->filename, -1, "UTF-8", "WINDOWS-1252", NULL, NULL, NULL); - if (dummy != NULL) - { - g_free (entry->filename); - entry->filename = dummy; - } - } - if (entry->is_dir) - pixbuf = xa_get_pixbuf_icon_from_cache("folder"); - else if (entry->is_encrypted) - { - pixbuf = xa_get_pixbuf_icon_from_cache("lock"); - archive->has_passwd = TRUE; - } - else - pixbuf = xa_get_pixbuf_icon_from_cache(entry->filename); - - g
[Xfce4-commits] r27244 - xarchiver/trunk/src
Author: colossus Date: 2008-07-09 10:04:28 + (Wed, 09 Jul 2008) New Revision: 27244 Modified: xarchiver/trunk/src/archive.c Log: The archive directories entries are now inserted at the top of the liststore. Thanks to Enrico Troeger for providing the code. Modified: xarchiver/trunk/src/archive.c === --- xarchiver/trunk/src/archive.c 2008-07-09 09:58:56 UTC (rev 27243) +++ xarchiver/trunk/src/archive.c 2008-07-09 10:04:28 UTC (rev 27244) @@ -528,6 +528,7 @@ { GdkPixbuf *pixbuf = NULL; GtkTreeIter iter; + GtkTreeIter *last_dir_iter = NULL; unsigned short int i; gpointer current_column; @@ -564,7 +565,21 @@ while (entry) { current_column = entry->columns; - gtk_list_store_append (archive->liststore, &iter); + //gtk_list_store_append (archive->liststore, &iter); + if (entry->is_dir) + { + if (last_dir_iter == NULL) + gtk_list_store_prepend(archive->liststore, &iter); + else + { + gtk_list_store_insert_after(archive->liststore, &iter, last_dir_iter); + gtk_tree_iter_free(last_dir_iter); + } + last_dir_iter = gtk_tree_iter_copy(&iter); + } + else + gtk_list_store_append(archive->liststore, &iter); + if(!g_utf8_validate(entry->filename, -1, NULL) ) { gchar *dummy = g_convert(entry->filename, -1, "UTF-8", "WINDOWS-1252", NULL, NULL, NULL); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27242 - xarchiver/trunk/src
Author: colossus Date: 2008-07-09 09:37:13 + (Wed, 09 Jul 2008) New Revision: 27242 Modified: xarchiver/trunk/src/interface.c xarchiver/trunk/src/interface.h xarchiver/trunk/src/window.c xarchiver/trunk/src/window.h Log: Added option Save as in the Archive menu. Thanks to Alexandre Moreira for suggesting it. Modified: xarchiver/trunk/src/interface.c === --- xarchiver/trunk/src/interface.c 2008-07-09 09:09:16 UTC (rev 27241) +++ xarchiver/trunk/src/interface.c 2008-07-09 09:37:13 UTC (rev 27242) @@ -84,6 +84,10 @@ open1 = gtk_image_menu_item_new_from_stock ("gtk-open", accel_group); gtk_widget_show (open1); gtk_container_add (GTK_CONTAINER (menuitem1_menu), open1); + + save1 = gtk_image_menu_item_new_from_stock ("gtk-save-as", accel_group); + gtk_widget_show (save1); + gtk_container_add (GTK_CONTAINER (menuitem1_menu), save1); separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (separatormenuitem1); @@ -457,6 +461,7 @@ g_signal_connect ((gpointer) new1, "activate", G_CALLBACK (xa_new_archive), NULL); g_signal_connect ((gpointer) open1, "activate", G_CALLBACK (xa_open_archive), NULL); + g_signal_connect ((gpointer) save1, "activate", G_CALLBACK (xa_save_archive), NULL); g_signal_connect ((gpointer) check_menu, "activate", G_CALLBACK (xa_test_archive), NULL); g_signal_connect ((gpointer) properties, "activate", G_CALLBACK (xa_archive_properties), NULL); g_signal_connect ((gpointer) extract_menu, "activate", G_CALLBACK (xa_extract_archive), NULL); Modified: xarchiver/trunk/src/interface.h === --- xarchiver/trunk/src/interface.h 2008-07-09 09:09:16 UTC (rev 27241) +++ xarchiver/trunk/src/interface.h 2008-07-09 09:37:13 UTC (rev 27242) @@ -31,6 +31,7 @@ GtkWidget *menuitem1_menu; GtkWidget *new1; GtkWidget *open1; +GtkWidget *save1; GtkWidget *entry1; GtkWidget *progressbar; GtkWidget *info_label; Modified: xarchiver/trunk/src/window.c === --- xarchiver/trunk/src/window.c2008-07-09 09:09:16 UTC (rev 27241) +++ xarchiver/trunk/src/window.c2008-07-09 09:37:13 UTC (rev 27242) @@ -247,6 +247,41 @@ return response; } +void xa_save_archive (GtkMenuItem *menuitem,gpointer data) +{ + gint current_page; + gint idx; + GtkWidget *save = NULL; + gchar *path = NULL,*command,*filename; + gboolean response; + GSList *list = NULL; + + current_page = gtk_notebook_get_current_page(notebook); + idx = xa_find_archive_index (current_page); + + save = gtk_file_chooser_dialog_new ( _("Save the archive as"), + GTK_WINDOW (xa_main_window), + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, + "gtk-save", + GTK_RESPONSE_ACCEPT, + NULL); + filename = xa_remove_path_from_archive_name(archive[idx]->escaped_path); + gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (save), filename); + g_free(filename); + response = gtk_dialog_run (GTK_DIALOG(save)); + if (response == GTK_RESPONSE_ACCEPT) + path = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(save)); + gtk_widget_destroy (save); + if (path != NULL) + { + command = g_strconcat ("cp ",archive[idx]->escaped_path," ",path,NULL); + list = g_slist_append(list,command); + xa_run_command(archive[idx],list); + } +} + void xa_open_archive (GtkMenuItem *menuitem,gpointer data) { gchar *path = NULL; Modified: xarchiver/trunk/src/window.h === --- xarchiver/trunk/src/window.h2008-07-09 09:09:16 UTC (rev 27241) +++ xarchiver/trunk/src/window.h2008-07-09 09:37:13 UTC (rev 27242) @@ -60,6 +60,7 @@ GtkWidget *dialog, *scrollwin, *view_window, *_properties_win; void xa_new_archive (GtkMenuItem *, gpointer); +void xa_save_archive (GtkMenuItem *,gpointer); void xa_open_archive (GtkMenuItem *, gpointer); void xa_test_archive (GtkMenuItem *, gpointer); void xa_close_archive (GtkMenuItem *, gpointer); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r27241 - xarchiver/trunk/src
Author: colossus Date: 2008-07-09 09:09:16 + (Wed, 09 Jul 2008) New Revision: 27241 Modified: xarchiver/trunk/src/archive.c xarchiver/trunk/src/archive.h xarchiver/trunk/src/interface.c xarchiver/trunk/src/interface.h xarchiver/trunk/src/main.c xarchiver/trunk/src/main.h xarchiver/trunk/src/window.c xarchiver/trunk/src/window.h Log: Add files into specific archive directories is now possible with drag and drop to the sidepane. Changed View popmenu entry to Open. Modified: xarchiver/trunk/src/archive.c === --- xarchiver/trunk/src/archive.c 2008-07-09 06:30:06 UTC (rev 27240) +++ xarchiver/trunk/src/archive.c 2008-07-09 09:09:16 UTC (rev 27241) @@ -900,37 +900,3 @@ return FALSE; } -void xa_sidepane_drag_data_received (GtkWidget *widget,GdkDragContext *context,int x,int y,GtkSelectionData *data, unsigned int info,unsigned int time,gpointer user_data) -{ - gchar **array = NULL; - gchar *filename = NULL; - gchar *dirname = NULL; - unsigned int len = 0; - GtkTreeIter iter; - GtkTreeSelection *selection; - GtkTreeModel *model; - - array = gtk_selection_data_get_uris(data); - if (array == NULL || GTK_WIDGET_VISIBLE(viewport2)) - { - response = xa_show_message_dialog (GTK_WINDOW (xa_main_window),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_("Sorry, I could not perform the operation!"),"" ); - gtk_drag_finish(context,FALSE,FALSE,time); - return; - } - gtk_drag_finish (context,TRUE,FALSE,time); - - while (array[len]) - { - filename = g_filename_from_uri (array[len],NULL,NULL); - g_print ("You sent: %s\n",filename); - g_free(filename); - len++; - } - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); - if (gtk_tree_selection_get_selected (selection,&model,&iter)) - { - gtk_tree_model_get(model,&iter,1,&dirname,-1); - g_print ("Hai selezionato: %s\n",dirname); - g_free(dirname); - } -} Modified: xarchiver/trunk/src/archive.h === --- xarchiver/trunk/src/archive.h 2008-07-09 06:30:06 UTC (rev 27240) +++ xarchiver/trunk/src/archive.h 2008-07-09 09:09:16 UTC (rev 27241) @@ -153,6 +153,5 @@ void xa_sidepane_row_selected(GtkTreeSelection *selection, gpointer data); void xa_sidepane_select_row(XEntry *entry); gboolean _xa_sidepane_select_row(GtkTreeModel *model,GtkTreePath *path,GtkTreeIter *iter,gpointer data); -void xa_sidepane_drag_data_received (GtkWidget *widget,GdkDragContext *context,int x,int y,GtkSelectionData *data, unsigned int info,unsigned int time,gpointer user_data); XArchive *archive[100]; #endif Modified: xarchiver/trunk/src/interface.c === --- xarchiver/trunk/src/interface.c 2008-07-09 06:30:06 UTC (rev 27240) +++ xarchiver/trunk/src/interface.c 2008-07-09 09:09:16 UTC (rev 27241) @@ -405,7 +405,7 @@ gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(archive_dir_model),1,GTK_SORT_ASCENDING); gtk_tree_view_enable_model_drag_dest(GTK_TREE_VIEW(archive_dir_treeview),drop_targets,1,GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_ASK); g_signal_connect (G_OBJECT (archive_dir_treeview), "drag-data-received",G_CALLBACK (xa_sidepane_drag_data_received), NULL); - + g_signal_connect (G_OBJECT (archive_dir_treeview), "drag-motion",G_CALLBACK (xa_sidepane_drag_motion), NULL); GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW (archive_dir_treeview)); g_signal_connect (sel,"changed",G_CALLBACK (xa_sidepane_row_selected),NULL); @@ -636,6 +636,7 @@ { GtkWidget *password_dialog,*dialog_vbox1,*vbox1,*hbox2,*image2,*vbox2,*label_pwd_required,*label_filename,*hbox1,*label34,*pw_password_entry; gchar *password = NULL; + gboolean done = FALSE; password_dialog = gtk_dialog_new_with_buttons ("Xarchiver " VERSION, GTK_WINDOW (xa_main_window), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -1261,24 +1262,111 @@ //gtk_widget_set_sensitive (delete,value); } -/* - * Get file path of an item in the archive dir tree. - * The returned allocated string should be freed when no longer needed. - * By Hong Jen Yee (PCMan) <[EMAIL PROTECTED]> - */ -char *xa_dir_tree_get_path( GtkTreeIter* it ) +void xa_sidepane_drag_data_received (GtkWidget *widget,GdkDragContext *context,int x,int y,GtkSelectionData *data, unsigned int info,unsigned int time,gpointer user_data) { -GtkTreeIter parent_it; -char *path = NULL, *parent_path = NULL, *name = NULL; -gtk_tree_model_get( archive_dir_model, it, 1, &name,