[Xfce4-commits] r22443 - xarchiver/trunk/src
Author: colossus Date: 2006-07-14 07:43:56 + (Fri, 14 Jul 2006) New Revision: 22443 Modified: xarchiver/trunk/src/main.c Log: Fixed bug #2030, thanks to Jani Monoses for reporting it. Modified: xarchiver/trunk/src/main.c === --- xarchiver/trunk/src/main.c 2006-07-13 21:37:59 UTC (rev 22442) +++ xarchiver/trunk/src/main.c 2006-07-14 07:43:56 UTC (rev 22443) @@ -195,7 +195,8 @@ GString *string = g_string_new ( ); for ( x = 1; x argc; x++) ConcatenateFileNames2 ( argv[x] , string ); - + + archive-add_recurse = TRUE; cli_command = xa_add_single_files ( archive , string, NULL); if (cli_command != NULL) error_output = SpawnSyncCommand ( cli_command ); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22445 - xarchiver/trunk/src
Author: colossus Date: 2006-07-14 13:15:41 + (Fri, 14 Jul 2006) New Revision: 22445 Modified: xarchiver/trunk/src/add_dialog.c xarchiver/trunk/src/bzip2.c xarchiver/trunk/src/callbacks.c xarchiver/trunk/src/callbacks.h xarchiver/trunk/src/extract_dialog.c xarchiver/trunk/src/interface.c xarchiver/trunk/src/iso.c xarchiver/trunk/src/main.c xarchiver/trunk/src/rpm.c Log: Modified the message dialogs so to show an additional message. Modified: xarchiver/trunk/src/add_dialog.c === --- xarchiver/trunk/src/add_dialog.c2006-07-14 12:26:56 UTC (rev 22444) +++ xarchiver/trunk/src/add_dialog.c2006-07-14 13:15:41 UTC (rev 22445) @@ -494,7 +494,7 @@ case GTK_RESPONSE_OK: if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(add_dialog-file_liststore), iter) == FALSE) { - response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK, _(You haven't selected any files to add!) ); + response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_(Can't add files to the archive:), _(You haven't selected any files to add!) ); break; } if ( add_dialog-add_password != NULL gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(add_dialog-add_password)) ) @@ -502,7 +502,7 @@ temp_password = g_strdup (gtk_entry_get_text ( GTK_ENTRY (add_dialog-add_password_entry) )); if (strlen(temp_password) == 0) { - response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK, _(Please enter the password!) ); + response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK, _(You missed the password!),_(Please enter it!) ); g_free (temp_password); break; } Modified: xarchiver/trunk/src/bzip2.c === --- xarchiver/trunk/src/bzip2.c 2006-07-14 12:26:56 UTC (rev 22444) +++ xarchiver/trunk/src/bzip2.c 2006-07-14 13:15:41 UTC (rev 22445) @@ -108,7 +108,7 @@ g_free ( new_path ); if ( stream == NULL ) { - response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,g_strerror(errno)); + response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_(Can't open the file:),g_strerror(errno)); done = FALSE; break; } @@ -121,7 +121,7 @@ g_io_add_watch (ioc, G_IO_IN|G_IO_PRI|G_IO_ERR|G_IO_HUP|G_IO_NVAL, ExtractToDifferentLocation, stream); } else - response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK, _(Please select where to extract files!) ); + response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK, _(You missed the extraction path!),(Please select it.) ); break; } } @@ -150,7 +150,7 @@ stream = fdopen ( fd , w ); if ( stream == NULL) { - response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,g_strerror(errno) ); + response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK,_(Can't write to /tmp:),g_strerror(errno) ); g_free (tmp); return NULL; } @@ -196,7 +196,7 @@ } else if (error != NULL) { -response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK, error-message); +response = ShowGtkMessageDialog (GTK_WINDOW (MainWindow),GTK_DIALOG_MODAL,GTK_MESSAGE_ERROR,GTK_BUTTONS_OK, _(An error occurred:),error-message); g_error_free (error); return FALSE; } @@ -247,7 +247,7 @@ if ( WEXITSTATUS (status) ) { gtk_window_set_title ( GTK_WINDOW (MainWindow) , Xarchiver VERSION ); -
[Xfce4-commits] r22446 - xarchiver/trunk/po
Author: colossus Date: 2006-07-14 13:17:02 + (Fri, 14 Jul 2006) New Revision: 22446 Modified: xarchiver/trunk/po/xarchiver.pot Log: Updated xarchiver.pot because of the previous commit. Modified: xarchiver/trunk/po/xarchiver.pot === --- xarchiver/trunk/po/xarchiver.pot2006-07-14 13:15:41 UTC (rev 22445) +++ xarchiver/trunk/po/xarchiver.pot2006-07-14 13:17:02 UTC (rev 22446) @@ -8,7 +8,7 @@ msgstr Project-Id-Version: PACKAGE VERSION\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-07-14 12:32+0200\n +POT-Creation-Date: 2006-07-14 15:18+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 @@ -71,6 +71,10 @@ msgid Size msgstr +#: src/bzip2.c:111 +msgid Can't open the file: +msgstr + #: src/bzip2.c:115 msgid Extracting msgstr @@ -80,50 +84,62 @@ msgstr #: src/bzip2.c:124 -msgid Please select where to extract files! +msgid You missed the extraction path! msgstr #: src/bzip2.c:141 src/callbacks.c:107 msgid Operation canceled. msgstr +#: src/bzip2.c:153 +msgid Can't write to /tmp: +msgstr + +#: src/bzip2.c:199 src/rpm.c:203 +msgid An error occurred: +msgstr + #: src/bzip2.c:231 msgid Decompressing tar file with msgstr #: src/bzip2.c:250 -msgid -An error occurred while decompressing the archive.\n -Do you want to open the error messages window? +msgid An error occurred while decompressing the archive! msgstr #: src/bzip2.c:256 src/bzip2.c:314 src/bzip2.c:341 src/callbacks.c:142 -#: src/callbacks.c:1801 src/rpm.c:117 src/rpm.c:145 +#: src/callbacks.c:1807 src/rpm.c:117 src/rpm.c:145 msgid Operation failed. msgstr #: src/bzip2.c:308 -msgid -An error occurred while adding to the tar archive.\n -Do you want to open the error messages window? +msgid An error occurred while adding to the tar archive! msgstr #: src/bzip2.c:308 -msgid -An error occurred while deleting from the tar archive.\n -Do you want to open the error messages window? +msgid An error occurred while deleting from the tar archive! msgstr +#: src/bzip2.c:308 src/bzip2.c:335 src/callbacks.c:132 src/rpm.c:148 +msgid Do you want to open the error messages window? +msgstr + #: src/bzip2.c:318 msgid Recompressing tar file with msgstr #: src/bzip2.c:335 -msgid -An error occurred while recompressing the tar archive.\n -Do you want to open the error messages window? +msgid An error occurred while recompressing the tar archive! msgstr +#: src/bzip2.c:349 +msgid Can't recompress the archive: +msgstr + +#: src/bzip2.c:396 +msgid Can't decompress the archive: +msgstr + #: src/callbacks.c:111 msgid Please check \ msgstr @@ -133,12 +149,10 @@ msgstr #: src/callbacks.c:132 -msgid -An error occurred while accessing the archive.\n -Do you want to open the error messages window? +msgid An error occurred while accessing the archive. msgstr -#: src/callbacks.c:155 src/callbacks.c:1220 src/extract_dialog.c:522 +#: src/callbacks.c:155 src/callbacks.c:1226 src/extract_dialog.c:522 #: src/extract_dialog.c:561 src/iso.c:680 msgid Operation completed. msgstr @@ -147,184 +161,195 @@ msgid Please wait while the content of the archive is being updated... msgstr -#: src/callbacks.c:202 +#: src/callbacks.c:203 msgid Operation successfully completed. msgstr -#: src/callbacks.c:217 +#: src/callbacks.c:218 #, c-format -msgid The archive \%s\ already exists. Do you want to overwrite it? +msgid The archive \%s\ already exists! msgstr -#: src/callbacks.c:252 +#: src/callbacks.c:224 +msgid Do you want to overwrite it? +msgstr + +#: src/callbacks.c:254 msgid Choose Add File to create the compressed file. msgstr -#: src/callbacks.c:256 +#: src/callbacks.c:258 msgid Choose Add to begin creating the archive. msgstr -#: src/callbacks.c:307 -msgid The format of this archive is not recognized ! +#: src/callbacks.c:310 +#, c-format +msgid Can't open file \%s\: msgstr -#: src/callbacks.c:326 -msgid -Sorry, this archive format is not supported since the proper archiver is not -installed! +#: src/callbacks.c:313 +msgid Archive format is not recognized! msgstr -#: src/callbacks.c:333 +#: src/callbacks.c:334 +msgid Sorry, this archive format is not supported: +msgstr + +#: src/callbacks.c:334 +msgid the proper archiver is not installed! +msgstr + +#: src/callbacks.c:341 msgid Please wait while the content of the ISO image is being read... msgstr -#: src/callbacks.c:335 +#: src/callbacks.c:343 msgid Please wait while the content of the archive is being read... msgstr -#: src/callbacks.c:396 +#: src/callbacks.c:404 msgid Testing archive integrity, please wait... msgstr -#: src/callbacks.c:444 +#: src/callbacks.c:452 msgid Please hit the Stop button first! msgstr -#: src/callbacks.c:475 +#: src/callbacks.c:483 msgid You are about to delete msgstr -#: src/callbacks.c:475 +#:
[Xfce4-commits] r22447 - in thunar/trunk: . plugins/thunar-apr thunar
Author: benny Date: 2006-07-14 14:49:33 + (Fri, 14 Jul 2006) New Revision: 22447 Modified: thunar/trunk/ChangeLog thunar/trunk/plugins/thunar-apr/thunar-apr-image-page.c thunar/trunk/thunar/thunar-preferences-dialog.c Log: 2006-07-14 Benedikt Meurer [EMAIL PROTECTED] * plugins/thunar-apr/thunar-apr-image-page.c: Add ISO Speed Ratings to the Image page. * thunar/thunar-preferences-dialog.c(thunar_preferences_dialog_init): Avoid duplication in the user interface, as suggested by Eugenia Loli-Queru [EMAIL PROTECTED]. Modified: thunar/trunk/ChangeLog === --- thunar/trunk/ChangeLog 2006-07-14 13:17:02 UTC (rev 22446) +++ thunar/trunk/ChangeLog 2006-07-14 14:49:33 UTC (rev 22447) @@ -1,3 +1,11 @@ +2006-07-14 Benedikt Meurer [EMAIL PROTECTED] + + * plugins/thunar-apr/thunar-apr-image-page.c: Add ISO Speed Ratings + to the Image page. + * thunar/thunar-preferences-dialog.c(thunar_preferences_dialog_init): + Avoid duplication in the user interface, as suggested by Eugenia + Loli-Queru [EMAIL PROTECTED]. + 2006-07-10 Benedikt Meurer [EMAIL PROTECTED] * thunar-vfs/thunar-vfs-thumb-pixbuf.c: sys/types.h must be included Modified: thunar/trunk/plugins/thunar-apr/thunar-apr-image-page.c === --- thunar/trunk/plugins/thunar-apr/thunar-apr-image-page.c 2006-07-14 13:17:02 UTC (rev 22446) +++ thunar/trunk/plugins/thunar-apr/thunar-apr-image-page.c 2006-07-14 14:49:33 UTC (rev 22447) @@ -46,17 +46,18 @@ ExifTag tag; } TAIP_EXIF[] = { - { N_ (Date Taken:), EXIF_TAG_DATE_TIME, }, - { N_ (Camera Brand:), EXIF_TAG_MAKE,}, - { N_ (Camera Model:), EXIF_TAG_MODEL, }, - { N_ (Exposure Time:),EXIF_TAG_EXPOSURE_TIME, }, - { N_ (Exposure Program:), EXIF_TAG_EXPOSURE_PROGRAM,}, - { N_ (Aperture Value:), EXIF_TAG_APERTURE_VALUE, }, - { N_ (Metering Mode:),EXIF_TAG_METERING_MODE, }, - { N_ (Flash Fired:), EXIF_TAG_FLASH, }, - { N_ (Focal Length:), EXIF_TAG_FOCAL_LENGTH,}, - { N_ (Shutter Speed:),EXIF_TAG_SHUTTER_SPEED_VALUE, }, - { N_ (Software:), EXIF_TAG_SOFTWARE,}, + { N_ (Date Taken:),EXIF_TAG_DATE_TIME, }, + { N_ (Camera Brand:), EXIF_TAG_MAKE,}, + { N_ (Camera Model:), EXIF_TAG_MODEL, }, + { N_ (Exposure Time:), EXIF_TAG_EXPOSURE_TIME, }, + { N_ (Exposure Program:), EXIF_TAG_EXPOSURE_PROGRAM,}, + { N_ (Aperture Value:),EXIF_TAG_APERTURE_VALUE, }, + { N_ (Metering Mode:), EXIF_TAG_METERING_MODE, }, + { N_ (Flash Fired:), EXIF_TAG_FLASH, }, + { N_ (Focal Length:), EXIF_TAG_FOCAL_LENGTH,}, + { N_ (Shutter Speed:), EXIF_TAG_SHUTTER_SPEED_VALUE, }, + { N_ (ISO Speed Ratings:), EXIF_TAG_ISO_SPEED_RATINGS, }, + { N_ (Software:), EXIF_TAG_SOFTWARE,}, }; #endif Modified: thunar/trunk/thunar/thunar-preferences-dialog.c === --- thunar/trunk/thunar/thunar-preferences-dialog.c 2006-07-14 13:17:02 UTC (rev 22446) +++ thunar/trunk/thunar/thunar-preferences-dialog.c 2006-07-14 14:49:33 UTC (rev 22447) @@ -452,7 +452,7 @@ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0); gtk_widget_show (frame); - label = gtk_label_new (_(Behavior)); + label = gtk_label_new (_(Navigation)); gtk_label_set_attributes (GTK_LABEL (label), thunar_pango_attr_list_bold ()); gtk_frame_set_label_widget (GTK_FRAME (frame), label); gtk_widget_show (label); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22449 - xfdesktop/trunk/src
Author: kelnos Date: 2006-07-14 21:49:22 + (Fri, 14 Jul 2006) New Revision: 22449 Modified: xfdesktop/trunk/src/xfce-desktop.c Log: redo how the backdrop is drawn to fix ugly gradients on 16-bit displays (bug 1819). this also makes drawing quite a bit simpler and possibly even a bit faster. Modified: xfdesktop/trunk/src/xfce-desktop.c === --- xfdesktop/trunk/src/xfce-desktop.c 2006-07-14 18:49:46 UTC (rev 22448) +++ xfdesktop/trunk/src/xfce-desktop.c 2006-07-14 21:49:22 UTC (rev 22449) @@ -223,6 +223,8 @@ { gchar property_name[128]; +gdk_error_trap_push(); + g_snprintf(property_name, 128, XFDESKTOP_IMAGE_FILE_FMT, monitor); if(filename) { gdk_property_change(gdk_screen_get_root_window(desktop-priv-gscreen), @@ -234,19 +236,47 @@ gdk_property_delete(gdk_screen_get_root_window(desktop-priv-gscreen), gdk_atom_intern(property_name, FALSE)); } + +gdk_error_trap_pop(); } static void +set_real_root_window_pixmap(GdkScreen *gscreen, +GdkPixmap *pmap) +{ +Window xid; +GdkWindow *groot; + +xid = GDK_DRAWABLE_XID(pmap); +groot = gdk_screen_get_root_window(gscreen); + +gdk_error_trap_push(); + +/* set root property for transparent Eterms */ +gdk_property_change(groot, +gdk_atom_intern(_XROOTPMAP_ID, FALSE), +gdk_atom_intern(PIXMAP, FALSE), 32, +GDK_PROP_MODE_REPLACE, (guchar *)xid, 1); +/* set this other property because someone might need it sometime. */ +gdk_property_change(groot, +gdk_atom_intern(ESETROOT_PMAP_ID, FALSE), +gdk_atom_intern(PIXMAP, FALSE), 32, +GDK_PROP_MODE_REPLACE, (guchar *)xid, 1); +/* and set the root window's BG pixmap, because aterm is somewhat lame. */ +gdk_window_set_back_pixmap(groot, pmap, FALSE); +/* there really should be a standard for this crap... */ + +gdk_error_trap_pop(); +} + +static void backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data) { XfceDesktop *desktop = XFCE_DESKTOP(user_data); +GdkPixmap *pmap = desktop-priv-bg_pixmap; +GdkScreen *gscreen = desktop-priv-gscreen; GdkPixbuf *pix; -GdkPixmap *pmap = NULL; -GdkColormap *cmap; -GdkScreen *gscreen; GdkRectangle rect; -Pixmap xid; -GdkWindow *groot; gint i, monitor = -1; TRACE(entering); @@ -258,9 +288,6 @@ TRACE(really entering); -gscreen = desktop-priv-gscreen; -cmap = gdk_drawable_get_colormap(GDK_DRAWABLE(GTK_WIDGET(desktop)-window)); - for(i = 0; i XFCE_DESKTOP(desktop)-priv-nbackdrops; i++) { if(backdrop == XFCE_DESKTOP(desktop)-priv-backdrops[i]) { monitor = i; @@ -275,86 +302,24 @@ if(!pix) return; -if(desktop-priv-nbackdrops == 1) { -/* optimised for single monitor: just dump the pixbuf into a pixmap */ -gdk_pixbuf_render_pixmap_and_mask_for_colormap(pix, cmap, pmap, NULL, 0); -g_object_unref(G_OBJECT(pix)); -if(!pmap) -return; +if(desktop-priv-nbackdrops == 1) { +/* single monitor */ rect.x = rect.y = 0; rect.width = gdk_screen_get_width(gscreen); rect.height = gdk_screen_get_height(gscreen); -} else { -/* multiple monitors (xinerama): download the current backdrop, paint - * over the correct area, and upload it back. this is slow, but - * probably still faster than redoing the whole thing. */ -GdkPixmap *cur_pmap = NULL; -GdkPixbuf *cur_pbuf = NULL; -gint swidth, sheight; - -swidth = gdk_screen_get_width(gscreen); -sheight = gdk_screen_get_height(gscreen); - -cur_pmap = desktop-priv-bg_pixmap; -if(cur_pmap) { -gint pw, ph; -gdk_drawable_get_size(GDK_DRAWABLE(cur_pmap), pw, ph); -if(pw == swidth ph == sheight) { -cur_pbuf = gdk_pixbuf_get_from_drawable(NULL, -GDK_DRAWABLE(cur_pmap), cmap, 0, 0, 0, 0, swidth, -sheight); -} else -cur_pmap = NULL; -} -/* if the style's bg_pixmap was empty, or the above failed... */ -if(!cur_pmap) { -cur_pbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, -swidth, sheight); -} - +} else gdk_screen_get_monitor_geometry(gscreen, monitor, rect); -gdk_pixbuf_copy_area(pix, 0, 0, gdk_pixbuf_get_width(pix), -gdk_pixbuf_get_height(pix), cur_pbuf, rect.x, rect.y); -g_object_unref(G_OBJECT(pix)); -pmap = NULL; -gdk_pixbuf_render_pixmap_and_mask_for_colormap(cur_pbuf, cmap, -pmap, NULL, 0); -g_object_unref(G_OBJECT(cur_pbuf)); -if(!pmap)
[Xfce4-commits] r22450 - xfdesktop/trunk/menueditor
Author: pollux Date: 2006-07-14 22:10:33 + (Fri, 14 Jul 2006) New Revision: 22450 Modified: xfdesktop/trunk/menueditor/menueditor-add-dialog.c xfdesktop/trunk/menueditor/menueditor-add-external-dialog.c xfdesktop/trunk/menueditor/menueditor-edit-dialog.c xfdesktop/trunk/menueditor/menueditor-edit-external-dialog.c Log: hitting enter in the add/edit dialog triggers default response Modified: xfdesktop/trunk/menueditor/menueditor-add-dialog.c === --- xfdesktop/trunk/menueditor/menueditor-add-dialog.c 2006-07-14 21:49:22 UTC (rev 22449) +++ xfdesktop/trunk/menueditor/menueditor-add-dialog.c 2006-07-14 22:10:33 UTC (rev 22450) @@ -152,6 +152,7 @@ gtk_table_attach (GTK_TABLE (table), priv-label_name, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0); priv-entry_name = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (priv-entry_name), TRUE); gtk_widget_show (priv-entry_name); gtk_table_attach (GTK_TABLE (table), priv-entry_name, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 6); @@ -166,7 +167,9 @@ hbox = gtk_hbox_new (FALSE, 0); gtk_widget_show (hbox); + priv-entry_command = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (priv-entry_command), TRUE); gtk_widget_show (priv-entry_command); gtk_box_pack_start (GTK_BOX (hbox), priv-entry_command, TRUE, TRUE, 0); @@ -193,6 +196,7 @@ gtk_container_add (GTK_CONTAINER (priv-radio_button_themed_icon), label); priv-entry_themed_icon = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (priv-entry_themed_icon), TRUE); gtk_widget_show (priv-entry_themed_icon); gtk_table_attach (GTK_TABLE (table), priv-entry_themed_icon, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); @@ -250,6 +254,7 @@ gtk_table_attach (GTK_TABLE (table), priv-check_button_interm, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); } /*/ Modified: xfdesktop/trunk/menueditor/menueditor-add-external-dialog.c === --- xfdesktop/trunk/menueditor/menueditor-add-external-dialog.c 2006-07-14 21:49:22 UTC (rev 22449) +++ xfdesktop/trunk/menueditor/menueditor-add-external-dialog.c 2006-07-14 22:10:33 UTC (rev 22450) @@ -173,6 +173,7 @@ gtk_table_attach (GTK_TABLE (table), priv-check_button_unique, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); gtk_combo_box_set_active (GTK_COMBO_BOX (priv-combo_type), 0); } Modified: xfdesktop/trunk/menueditor/menueditor-edit-dialog.c === --- xfdesktop/trunk/menueditor/menueditor-edit-dialog.c 2006-07-14 21:49:22 UTC (rev 22449) +++ xfdesktop/trunk/menueditor/menueditor-edit-dialog.c 2006-07-14 22:10:33 UTC (rev 22450) @@ -128,6 +128,7 @@ gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0); priv-entry_name = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (priv-entry_name), TRUE); gtk_widget_show (priv-entry_name); gtk_table_attach (GTK_TABLE (table), priv-entry_name, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 6); @@ -142,7 +143,9 @@ priv-hbox_command = gtk_hbox_new (FALSE, 0); gtk_widget_show (priv-hbox_command); + priv-entry_command = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (priv-entry_command), TRUE); gtk_widget_show (priv-entry_command); gtk_box_pack_start (GTK_BOX (priv-hbox_command), priv-entry_command, TRUE, TRUE, 0); @@ -169,6 +172,7 @@ gtk_container_add (GTK_CONTAINER (priv-radio_button_themed_icon), label); priv-entry_themed_icon = gtk_entry_new (); + gtk_entry_set_activates_default (GTK_ENTRY (priv-entry_themed_icon), TRUE); gtk_widget_show (priv-entry_themed_icon); gtk_table_attach (GTK_TABLE (table), priv-entry_themed_icon, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); @@ -226,6 +230,7 @@ gtk_table_attach (GTK_TABLE (table), priv-check_button_interm, 1, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0); gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); } /*/ Modified: xfdesktop/trunk/menueditor/menueditor-edit-external-dialog.c === --- xfdesktop/trunk/menueditor/menueditor-edit-external-dialog.c 2006-07-14 21:49:22 UTC (rev 22449) +++
[Xfce4-commits] r22451 - xfprint/trunk
Author: pollux Date: 2006-07-14 22:15:30 + (Fri, 14 Jul 2006) New Revision: 22451 Modified: xfprint/trunk/NEWS Log: update NEWS Modified: xfprint/trunk/NEWS === --- xfprint/trunk/NEWS 2006-07-14 22:10:33 UTC (rev 22450) +++ xfprint/trunk/NEWS 2006-07-14 22:15:30 UTC (rev 22451) @@ -1,6 +1,11 @@ NEWS for xfprint +4.3.90.2 + + +- use GtkIconTheme instead of deprecated XfceIconTheme + 4.3.90.1 - Remove the a2ps dependency now it looks for it at runtime ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r22452 - xfdesktop/trunk/src
Author: kelnos Date: 2006-07-15 02:11:40 + (Sat, 15 Jul 2006) New Revision: 22452 Modified: xfdesktop/trunk/src/xfdesktop-file-icon-manager.c Log: make sure we don't show a folder for the desktop folder if the folder itself is modified (bug 1916) Modified: xfdesktop/trunk/src/xfdesktop-file-icon-manager.c === --- xfdesktop/trunk/src/xfdesktop-file-icon-manager.c 2006-07-14 22:15:30 UTC (rev 22451) +++ xfdesktop/trunk/src/xfdesktop-file-icon-manager.c 2006-07-15 02:11:40 UTC (rev 22452) @@ -2779,6 +2779,10 @@ case THUNAR_VFS_MONITOR_EVENT_CREATED: DBG(got created event); +/* make sure it's not the desktop folder itself */ +if(thunar_vfs_path_equal(fmanager-priv-folder, event_path)) +return; + /* first make sure we don't already have an icon for this path. * this seems to be necessary as thunar-vfs does not emit a * DELETED signal if a file is overwritten with another file of ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits