[Goodies-commits] r2815 - in xfce4-screenshooter-plugin/trunk: . panel-plugin
Daniel Bobadilla
dbl at xfce.org
Thu Jun 7 01:00:57 CEST 2007
Author: dbl
Date: 2007-06-06 23:00:56 +0000 (Wed, 06 Jun 2007)
New Revision: 2815
Modified:
xfce4-screenshooter-plugin/trunk/configure.ac
xfce4-screenshooter-plugin/trunk/panel-plugin/screenshooter.c
Log:
fix bug, Creates Screenshot.png on "Cancel". Debian bug nro 420242
Modified: xfce4-screenshooter-plugin/trunk/configure.ac
===================================================================
--- xfce4-screenshooter-plugin/trunk/configure.ac 2007-06-06 10:13:49 UTC (rev 2814)
+++ xfce4-screenshooter-plugin/trunk/configure.ac 2007-06-06 23:00:56 UTC (rev 2815)
@@ -3,7 +3,7 @@
dnl xfce4-test-plugin - Test plugin for the XFce4 panel
dnl
-m4_define([test_version], [1.0.0])
+m4_define([test_version], [1.0.2])
AC_INIT([xfce4-screenshooter-plugin], [test_version()],
[dbobadil at dcc.uchile.cl])
Modified: xfce4-screenshooter-plugin/trunk/panel-plugin/screenshooter.c
===================================================================
--- xfce4-screenshooter-plugin/trunk/panel-plugin/screenshooter.c 2007-06-06 10:13:49 UTC (rev 2814)
+++ xfce4-screenshooter-plugin/trunk/panel-plugin/screenshooter.c 2007-06-06 23:00:56 UTC (rev 2815)
@@ -200,7 +200,7 @@
return NULL;
file_name = g_strdup ("Screenshot.png");
if((test=open(file_name,O_RDWR,MODE))==-1)
- {
+ if((test=open(g_build_filename(uri, file_name, NULL),O_RDWR,MODE))==-1) {
return file_name;
}
do{
@@ -208,8 +208,7 @@
g_free (file_name);
file_name = g_strdup_printf ("Screenshot-%d.png",i);
}
- while((test=open(file_name,O_RDWR,MODE))!=-1);
-
+ while((test=open(g_build_filename(uri, file_name, NULL),O_RDWR,MODE))!=-1);
return file_name;
@@ -227,6 +226,7 @@
gint width;
gint height;
+ gint dialog_response;
gchar * filename = NULL;
gchar * basename = NULL;
@@ -266,32 +266,26 @@
gtk_image_set_from_pixbuf (GTK_IMAGE (sd->preview), thumbnail);
g_object_unref (thumbnail);
- filename = generate_filename_for_uri (xfce_file_chooser_get_current_folder(XFCE_FILE_CHOOSER (sd->chooser)));
+ filename = generate_filename_for_uri (xfce_file_chooser_get_current_folder(XFCE_FILE_CHOOSER (sd->chooser)));
if (sd->ask_for_file && filename)
{
gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (sd->chooser), filename);
- if (gtk_dialog_run (GTK_DIALOG (sd->chooser)) == GTK_RESPONSE_ACCEPT)
+
+ dialog_response = gtk_dialog_run (GTK_DIALOG (sd->chooser));
+ if (dialog_response == GTK_RESPONSE_ACCEPT)
{
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(sd->chooser));
}
gtk_widget_hide (GTK_WIDGET (sd->chooser));
}
- else
+
+ if (filename)
{
- /* sd->counter++;
- basename = g_strdup_printf ("Screenshot-%d.png", sd->counter);
- filename = g_build_filename (sd->screenshots_dir, basename, NULL);
- curdir = g_get_current_dir();
- filename = g_build_filename (curdir, basename, NULL);
- g_free(basename);
- */
+ if (!(sd->ask_for_file) || dialog_response == GTK_RESPONSE_ACCEPT)
+ gdk_pixbuf_save (screenshot, filename, "png", NULL, NULL);g_free (filename);
+ g_free(filename);
}
-
- if (filename) {
- gdk_pixbuf_save (screenshot, filename, "png", NULL, NULL);
- g_free (filename);
- }
}
static void
More information about the Goodies-commits
mailing list