[Xfce4-commits] [apps/xfce4-screenshooter] 10/10: Avoid GCC's mixed declarations and code warning
noreply at xfce.org
noreply at xfce.org
Mon Dec 17 00:04:44 CET 2018
This is an automated email from the git hooks/post-receive script.
a n d r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-screenshooter.
commit d4f8d66d7600a840ec74b786c456db78a3dbb34d
Author: Andre Miranda <andreldm at xfce.org>
Date: Sun Dec 16 18:47:57 2018 -0300
Avoid GCC's mixed declarations and code warning
---
lib/screenshooter-actions.c | 4 +-
lib/screenshooter-imgur-dialog.c | 102 ++++++++++++++++++++++++------------
lib/screenshooter-job-callbacks.c | 4 +-
panel-plugin/screenshooter-plugin.c | 4 +-
4 files changed, 77 insertions(+), 37 deletions(-)
diff --git a/lib/screenshooter-actions.c b/lib/screenshooter-actions.c
index 5a66b2e..ebc2c9e 100644
--- a/lib/screenshooter-actions.c
+++ b/lib/screenshooter-actions.c
@@ -150,6 +150,8 @@ take_screenshot_idle (ScreenshotData *sd)
void
screenshooter_take_screenshot (ScreenshotData *sd, gboolean immediate)
{
+ gint delay;
+
if (sd->region == SELECT)
{
/* The delay will be applied after the rectangle selection */
@@ -169,6 +171,6 @@ screenshooter_take_screenshot (ScreenshotData *sd, gboolean immediate)
/* Await the amount of the time specified by the user before capturing the
* screenshot, but not less than 200ms, otherwise the first dialog might
* appear on the screenshot. */
- gint delay = sd->delay == 0 ? 200 : sd->delay * 1000;
+ delay = sd->delay == 0 ? 200 : sd->delay * 1000;
g_timeout_add (delay, (GSourceFunc) take_screenshot_idle, sd);
}
diff --git a/lib/screenshooter-imgur-dialog.c b/lib/screenshooter-imgur-dialog.c
index 9311522..340ea70 100644
--- a/lib/screenshooter-imgur-dialog.c
+++ b/lib/screenshooter-imgur-dialog.c
@@ -104,17 +104,25 @@ ScreenshooterImgurDialog *
screenshooter_imgur_dialog_new (const gchar *upload_name,
const gchar *delete_hash)
{
+ GtkBuilder *builder;
+ GtkWidget *notebook;
+ GtkEntry *delete_link_entry;
+ GtkButton *delete_link_copy_button, *delete_link_view_button;
+ GtkToggleButton *link_full_toggle, *link_medium_toggle, *link_tiny_toggle;
+ GtkButton *link_copy_button, *link_view_button, *embed_copy_button;
+ ScreenshooterImgurDialog *self;
+
g_return_val_if_fail (upload_name != NULL, NULL);
- ScreenshooterImgurDialog *self = g_object_new (SCREENSHOOTER_TYPE_IMGUR_DIALOG, NULL);
+ self = g_object_new (SCREENSHOOTER_TYPE_IMGUR_DIALOG, NULL);
self->image_url = g_strdup_printf ("https://imgur.com/%s.png", upload_name);
self->thumbnail_url = g_strdup_printf ("https://imgur.com/%sl.png", upload_name);
self->small_thumbnail_url = g_strdup_printf ("https://imgur.com/%ss.png", upload_name);
self->delete_link = g_strdup_printf ("https://imgur.com/delete/%s", delete_hash);
- GtkBuilder* builder = gtk_builder_new_from_string (screenshooter_imgur_dialog_ui,
- screenshooter_imgur_dialog_ui_length);
+ builder = gtk_builder_new_from_string (screenshooter_imgur_dialog_ui,
+ screenshooter_imgur_dialog_ui_length);
// Setup window
self->window = xfce_titled_dialog_new_with_buttons (_("Screenshot"),
@@ -127,7 +135,7 @@ screenshooter_imgur_dialog_new (const gchar *upload_name,
gtk_window_set_default_size (GTK_WINDOW (self->window), 500, 330);
// Add notebook widget to window
- GtkWidget* notebook = GTK_WIDGET (gtk_builder_get_object (builder, "dialog-notebook"));
+ notebook = GTK_WIDGET (gtk_builder_get_object (builder, "dialog-notebook"));
gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (self->window))), notebook);
self->link_entry = GTK_ENTRY (gtk_builder_get_object (builder, "link_entry"));
@@ -136,17 +144,17 @@ screenshooter_imgur_dialog_new (const gchar *upload_name,
// Image tab
- GtkToggleButton *link_full_toggle = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "link_full_toggle"));
- GtkToggleButton *link_medium_toggle = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "link_medium_toggle"));
- GtkToggleButton *link_tiny_toggle = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "link_tiny_toggle"));
+ link_full_toggle = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "link_full_toggle"));
+ link_medium_toggle = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "link_medium_toggle"));
+ link_tiny_toggle = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "link_tiny_toggle"));
g_signal_connect (link_full_toggle, "toggled", (GCallback) cb_link_toggle_full, (gpointer) self);
g_signal_connect (link_medium_toggle, "toggled", (GCallback) cb_link_toggle_medium, (gpointer) self);
g_signal_connect (link_tiny_toggle, "toggled", (GCallback) cb_link_toggle_tiny, (gpointer) self);
- GtkButton *link_copy_button = GTK_BUTTON (gtk_builder_get_object (builder, "link_copy_button"));
- GtkButton *link_view_button = GTK_BUTTON (gtk_builder_get_object (builder, "link_view_button"));
- GtkButton *embed_copy_button = GTK_BUTTON (gtk_builder_get_object (builder, "embed_copy_button"));
+ link_copy_button = GTK_BUTTON (gtk_builder_get_object (builder, "link_copy_button"));
+ link_view_button = GTK_BUTTON (gtk_builder_get_object (builder, "link_view_button"));
+ embed_copy_button = GTK_BUTTON (gtk_builder_get_object (builder, "embed_copy_button"));
g_signal_connect (link_copy_button, "clicked", (GCallback) cb_link_copy, (gpointer) self);
g_signal_connect (link_view_button, "clicked", (GCallback) cb_link_view_in_browser, (gpointer) self);
@@ -174,11 +182,11 @@ screenshooter_imgur_dialog_new (const gchar *upload_name,
// Deletion link tab
- GtkEntry *delete_link_entry = GTK_ENTRY (gtk_builder_get_object (builder, "delete_link_entry"));
+ delete_link_entry = GTK_ENTRY (gtk_builder_get_object (builder, "delete_link_entry"));
gtk_entry_set_text (delete_link_entry, self->delete_link);
- GtkButton *delete_link_copy_button = GTK_BUTTON (gtk_builder_get_object (builder, "delete_link_copy_button"));
- GtkButton *delete_link_view_button = GTK_BUTTON (gtk_builder_get_object (builder, "delete_link_view_button"));
+ delete_link_copy_button = GTK_BUTTON (gtk_builder_get_object (builder, "delete_link_copy_button"));
+ delete_link_view_button = GTK_BUTTON (gtk_builder_get_object (builder, "delete_link_view_button"));
g_signal_connect (delete_link_copy_button, "clicked", G_CALLBACK (cb_delete_link_copy), self);
g_signal_connect (delete_link_view_button, "clicked", G_CALLBACK (cb_delete_link_view), self);
@@ -193,9 +201,11 @@ screenshooter_imgur_dialog_new (const gchar *upload_name,
void
screenshooter_imgur_dialog_run (ScreenshooterImgurDialog *self)
{
+ GtkDialog *dialog;
+
g_return_if_fail (SCREENSHOOTER_IS_IMGUR_DIALOG (self));
- GtkDialog *dialog = GTK_DIALOG (self->window);
+ dialog = GTK_DIALOG (self->window);
gtk_widget_show_all (gtk_dialog_get_content_area (dialog));
gtk_dialog_run (dialog);
@@ -210,9 +220,11 @@ screenshooter_imgur_dialog_run (ScreenshooterImgurDialog *self)
static void
cb_link_toggle_full (GtkToggleButton *button, gpointer user_data)
{
+ ScreenshooterImgurDialog *dialog;
+
g_return_if_fail (SCREENSHOOTER_IS_IMGUR_DIALOG (user_data));
- ScreenshooterImgurDialog *dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
+ dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
if (gtk_toggle_button_get_active (button))
gtk_entry_set_text (dialog->link_entry, dialog->image_url);
}
@@ -222,9 +234,11 @@ cb_link_toggle_full (GtkToggleButton *button, gpointer user_data)
static void
cb_link_toggle_medium (GtkToggleButton *button, gpointer user_data)
{
+ ScreenshooterImgurDialog *dialog;
+
g_return_if_fail (SCREENSHOOTER_IS_IMGUR_DIALOG (user_data));
- ScreenshooterImgurDialog *dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
+ dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
if (gtk_toggle_button_get_active (button))
gtk_entry_set_text (dialog->link_entry, dialog->thumbnail_url);
}
@@ -234,9 +248,11 @@ cb_link_toggle_medium (GtkToggleButton *button, gpointer user_data)
static void
cb_link_toggle_tiny (GtkToggleButton *button, gpointer user_data)
{
+ ScreenshooterImgurDialog *dialog;
+
g_return_if_fail (SCREENSHOOTER_IS_IMGUR_DIALOG (user_data));
- ScreenshooterImgurDialog *dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
+ dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
if (gtk_toggle_button_get_active (button))
gtk_entry_set_text (dialog->link_entry, dialog->small_thumbnail_url);
}
@@ -246,12 +262,17 @@ cb_link_toggle_tiny (GtkToggleButton *button, gpointer user_data)
static void
cb_link_copy (GtkWidget *widget, gpointer user_data)
{
+ GtkClipboard *clipboard;
+ ScreenshooterImgurDialog *dialog;
+ guint16 len;
+ const gchar *text;
+
g_return_if_fail (SCREENSHOOTER_IS_IMGUR_DIALOG (user_data));
- ScreenshooterImgurDialog *dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
- const gchar *text = gtk_entry_get_text (dialog->link_entry);
- guint16 len = gtk_entry_get_text_length (dialog->link_entry);
- GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
+ text = gtk_entry_get_text (dialog->link_entry);
+ len = gtk_entry_get_text_length (dialog->link_entry);
+ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clipboard, text, len);
}
@@ -260,10 +281,13 @@ cb_link_copy (GtkWidget *widget, gpointer user_data)
static void
cb_link_view_in_browser (GtkWidget *widget, gpointer user_data)
{
+ ScreenshooterImgurDialog *dialog;
+ const gchar *link;
+
g_return_if_fail (SCREENSHOOTER_IS_IMGUR_DIALOG (user_data));
- ScreenshooterImgurDialog *dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
- const gchar *link = gtk_entry_get_text (dialog->link_entry);
+ dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
+ link = gtk_entry_get_text (dialog->link_entry);
exo_execute_preferred_application ("WebBrowser", link, NULL, NULL, NULL);
}
@@ -272,13 +296,14 @@ cb_link_view_in_browser (GtkWidget *widget, gpointer user_data)
static void
cb_generate_embed_text (GtkWidget* widget, gpointer user_data)
{
+ ScreenshooterImgurDialog *dialog;
const gchar *link = NULL;
gchar *text = NULL;
gboolean link_to_full_size;
g_return_if_fail (SCREENSHOOTER_IS_IMGUR_DIALOG (user_data));
- ScreenshooterImgurDialog *dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
+ dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
if (gtk_toggle_button_get_active (dialog->embed_full_toggle))
link = dialog->image_url;
@@ -318,18 +343,24 @@ cb_generate_embed_text (GtkWidget* widget, gpointer user_data)
static void
cb_embed_text_copy (GtkWidget* widget, gpointer user_data)
{
+ GtkClipboard *clipboard;
+ GtkTextBuffer *buffer;
+ ScreenshooterImgurDialog *dialog;
+ guint16 len;
+ const gchar *text;
+ GtkTextIter start, end;
+
g_return_if_fail (SCREENSHOOTER_IS_IMGUR_DIALOG (user_data));
- ScreenshooterImgurDialog *dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
+ dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
- GtkTextIter start, end;
- GtkTextBuffer *buffer = gtk_text_view_get_buffer (dialog->embed_text_view);
+ buffer = gtk_text_view_get_buffer (dialog->embed_text_view);
gtk_text_buffer_get_bounds (buffer, &start, &end);
- const gchar *text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
- guint16 len = strlen(text);
+ text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+ len = strlen (text);
- GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clipboard, text, len);
}
@@ -338,10 +369,13 @@ cb_embed_text_copy (GtkWidget* widget, gpointer user_data)
static void
cb_delete_link_copy (GtkWidget *widget, gpointer user_data)
{
+ GtkClipboard *clipboard;
+ ScreenshooterImgurDialog *dialog;
+
g_return_if_fail (SCREENSHOOTER_IS_IMGUR_DIALOG (user_data));
- ScreenshooterImgurDialog *dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
- GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+ dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
+ clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
gtk_clipboard_set_text (clipboard, dialog->delete_link, strlen (dialog->delete_link));
}
@@ -350,8 +384,10 @@ cb_delete_link_copy (GtkWidget *widget, gpointer user_data)
static void
cb_delete_link_view (GtkWidget *widget, gpointer user_data)
{
+ ScreenshooterImgurDialog *dialog;
+
g_return_if_fail (SCREENSHOOTER_IS_IMGUR_DIALOG (user_data));
- ScreenshooterImgurDialog *dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
+ dialog = SCREENSHOOTER_IMGUR_DIALOG (user_data);
exo_execute_preferred_application ("WebBrowser", dialog->delete_link, NULL, NULL, NULL);
}
diff --git a/lib/screenshooter-job-callbacks.c b/lib/screenshooter-job-callbacks.c
index 7a15bb5..3a5f3f2 100644
--- a/lib/screenshooter-job-callbacks.c
+++ b/lib/screenshooter-job-callbacks.c
@@ -356,10 +356,12 @@ void cb_image_uploaded (ScreenshooterJob *job,
gchar *delete_hash,
gchar **last_user)
{
+ ScreenshooterImgurDialog *dialog;
+
g_return_if_fail (upload_name != NULL);
g_return_if_fail (delete_hash != NULL);
- ScreenshooterImgurDialog* dialog = screenshooter_imgur_dialog_new (upload_name, delete_hash);
+ dialog = screenshooter_imgur_dialog_new (upload_name, delete_hash);
screenshooter_imgur_dialog_run (dialog);
g_object_unref (dialog);
diff --git a/panel-plugin/screenshooter-plugin.c b/panel-plugin/screenshooter-plugin.c
index a4de277..af4de2c 100644
--- a/panel-plugin/screenshooter-plugin.c
+++ b/panel-plugin/screenshooter-plugin.c
@@ -351,11 +351,11 @@ static void
screenshooter_plugin_construct (XfcePanelPlugin *plugin)
{
/* Initialise the data structs */
+ GFile *default_save_dir;
+ gint icon_size;
PluginData *pd = g_new0 (PluginData, 1);
ScreenshotData *sd = g_new0 (ScreenshotData, 1);
sd->app_info = NULL;
- GFile *default_save_dir;
- gint icon_size;
pd->sd = sd;
pd->plugin = plugin;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list