Skip to content

GitLab

ristretto
ristretto
Commit 8a374788 authored by Stephan Arts's avatar Stephan Arts
Browse files
Options

Cleanup compiler warnings and errors

parent 3be93d88
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 125 deletions
NEWS
View file @ 8a374788
x.x.x
0.2.0
=====
- Improve the sorting algorythm for filenames (Bug #6866, #3837)
- Add Stock-icon to set-wallpaper menu-item (Bug #8025)
......
src/Makefile.am
View file @ 8a374788
......@@ -4,7 +4,6 @@ ristretto_SOURCES = \
image_list.c image_list.h \
image_viewer.c image_viewer.h \
settings.c settings.h \
privacy_dialog.h privacy_dialog.c \
preferences_dialog.h preferences_dialog.c \
properties_dialog.h properties_dialog.c \
main_window_ui.h \
......@@ -18,6 +17,7 @@ ristretto_SOURCES = \
thumbnailer.c thumbnailer.h \
marshal.c marshal.h \
file.c file.h \
privacy_dialog.h privacy_dialog.c \
main.c
ristretto_CFLAGS = \
......
src/file.c
View file @ 8a374788
......@@ -329,14 +329,14 @@ rstto_file_get_content_type ( RsttoFile *file )
guint64
rstto_file_get_modified_time ( RsttoFile *file )
{
guint64 time = 0;
guint64 time_ = 0;
GFileInfo *file_info = g_file_query_info (file->priv->file, "time::modified", 0, NULL, NULL);
time = g_file_info_get_attribute_uint64 ( file_info, "time::modified" );
time_ = g_file_info_get_attribute_uint64 ( file_info, "time::modified" );
g_object_unref (file_info);
return time;
return time_;
}
gchar *
......
src/image_list.c
View file @ 8a374788
......@@ -23,6 +23,7 @@
#include <gtk/gtk.h>
#include <gtk/gtkmarshal.h>
#include <stdlib.h>
#include <string.h>
#include <libexif/exif-data.h>
......
src/image_list.h
View file @ 8a374788
......@@ -126,7 +126,7 @@ rstto_image_list_remove_all (RsttoImageList *image_list);
void
rstto_image_list_remove_file (RsttoImageList *image_list, RsttoFile *file);
gboolean
rstto_image_list_iter_find_image (RsttoImageListIter *iter, RsttoFile *file);
rstto_image_list_iter_find_file (RsttoImageListIter *iter, RsttoFile *file);
RsttoImageListIter *rstto_image_list_iter_clone (RsttoImageListIter *iter);
......
src/image_viewer.c
View file @ 8a374788
......@@ -139,8 +139,6 @@ rstto_image_viewer_paint (GtkWidget *widget);
static void
rstto_image_viewer_set_motion_state (RsttoImageViewer *viewer, RsttoImageViewerMotionState state);
static RsttoImageViewerMotionState
rstto_image_viewer_get_motion_state (RsttoImageViewer *viewer);
static gboolean
rstto_image_viewer_set_scroll_adjustments(RsttoImageViewer *, GtkAdjustment *, GtkAdjustment *);
......@@ -503,11 +501,8 @@ rstto_image_viewer_paint (GtkWidget *widget)
gint box_width, box_height;
/** BELOW THIS LINE THE VARIABLE_NAMES GET MESSY **/
GdkColor line_color;
GdkPixbuf *n_pixbuf = NULL;
gint width, height;
gint x1, x2, y1, y2;
gint i, a;
/** ABOVE THIS LINE THE VARIABLE_NAMES GET MESSY **/
g_value_init (&val_bg_color, GDK_TYPE_COLOR);
......@@ -997,6 +992,8 @@ rstto_image_viewer_load_image (
RsttoFile *file,
gdouble scale)
{
RsttoImageViewerTransaction *transaction = g_new0 (RsttoImageViewerTransaction, 1);
/*
* This will first need to return to the 'main' loop before it cleans up after itself.
* We can forget about the transaction, once it's cancelled, it will clean-up itself. -- (it should)
......@@ -1007,8 +1004,6 @@ rstto_image_viewer_load_image (
viewer->priv->transaction = NULL;
}
RsttoImageViewerTransaction *transaction = g_new0 (RsttoImageViewerTransaction, 1);
transaction->loader = gdk_pixbuf_loader_new();
transaction->cancellable = g_cancellable_new();
transaction->buffer = g_new0 (guchar, RSTTO_IMAGE_VIEWER_BUFFER_SIZE);
......@@ -1213,12 +1208,6 @@ rstto_image_viewer_set_motion_state (RsttoImageViewer *viewer, RsttoImageViewerM
viewer->priv->motion.state = state;
}
static RsttoImageViewerMotionState
rstto_image_viewer_get_motion_state (RsttoImageViewer *viewer)
{
return viewer->priv->motion.state;
}
/*
* rstto_image_viewer_set_orientation:
* @viewer:
......@@ -1772,6 +1761,8 @@ cb_rstto_image_viewer_queued_repaint (RsttoImageViewer *viewer)
g_object_unref (tmp_pixbuf);
tmp_pixbuf = tmp_pixbuf2;
break;
case RSTTO_IMAGE_VIEWER_ORIENT_NONE:
break;
}
viewer->priv->dst_pixbuf = gdk_pixbuf_scale_simple (tmp_pixbuf,
......@@ -2070,7 +2061,6 @@ rstto_button_press_event (
{
if (!(event->state & (GDK_CONTROL_MASK)))
{
GtkWidget *widget = GTK_WIDGET(viewer);
GdkCursor *cursor = gdk_cursor_new(GDK_FLEUR);
gdk_window_set_cursor(widget->window, cursor);
gdk_cursor_unref(cursor);
......@@ -2079,7 +2069,6 @@ rstto_button_press_event (
if (event->state & GDK_CONTROL_MASK)
{
GtkWidget *widget = GTK_WIDGET(viewer);
GdkCursor *cursor = gdk_cursor_new(GDK_UL_ANGLE);
gdk_window_set_cursor(widget->window, cursor);
gdk_cursor_unref(cursor);
......@@ -2123,6 +2112,7 @@ rstto_button_release_event (
gint pixbuf_y_offset;
gint width;
gint height;
gdouble tmp_x, tmp_y, scale;
if ( NULL != viewer->priv->dst_pixbuf )
{
......@@ -2204,14 +2194,13 @@ rstto_button_release_event (
* Calculate the center of the selection-box.
*/
gdouble tmp_y = (gtk_adjustment_get_value(viewer->vadjustment) + (gdouble)box_y + ((gdouble)box_height/ 2) - pixbuf_y_offset) / viewer->priv->scale;
tmp_y = (gtk_adjustment_get_value(viewer->vadjustment) + (gdouble)box_y + ((gdouble)box_height/ 2) - pixbuf_y_offset) / viewer->priv->scale;
gdouble tmp_x = (gtk_adjustment_get_value(viewer->hadjustment) + (gdouble)box_x + ((gdouble)box_width / 2) - pixbuf_x_offset) / viewer->priv->scale;
tmp_x = (gtk_adjustment_get_value(viewer->hadjustment) + (gdouble)box_x + ((gdouble)box_width / 2) - pixbuf_x_offset) / viewer->priv->scale;
/*
* Calculate the new scale
*/
gdouble scale;
if ((gtk_adjustment_get_page_size(viewer->hadjustment) / box_width) <
(gtk_adjustment_get_page_size(viewer->vadjustment) / box_height))
{
......
src/main_window.c
View file @ 8a374788
......@@ -159,7 +159,10 @@ static void
cb_rstto_main_window_image_list_iter_changed (RsttoImageListIter *iter, RsttoMainWindow *window);
static void
cb_rstto_main_window_image_list_new_image (RsttoImageList *image_list, GFile *file, RsttoMainWindow *window);
cb_rstto_main_window_image_list_new_image (
RsttoImageList *image_list,
RsttoFile *file,
RsttoMainWindow *window );
static void
cb_rstto_main_window_zoom_100 (GtkWidget *widget, RsttoMainWindow *window);
......@@ -396,7 +399,6 @@ rstto_main_window_init (RsttoMainWindow *window)
GtkWidget *main_vbox = gtk_vbox_new (FALSE, 0);
GtkRecentFilter *recent_filter;
guint window_width, window_height;
RsttoWallpaperManager *wallpaper_manager = NULL;
gchar *desktop_type = NULL;
GClosure *toggle_fullscreen_closure = g_cclosure_new ((GCallback)cb_rstto_main_window_fullscreen, window, NULL);
......@@ -870,11 +872,10 @@ rstto_main_window_image_list_iter_changed (RsttoMainWindow *window)
gchar *title = NULL;
gchar *status = NULL;
RsttoFile *cur_file = NULL;
gint position, count, width, height;
gint position, count;
RsttoImageList *image_list = window->priv->props.image_list;
GList *app_list, *iter;
const gchar *content_type;
gchar *uri = NULL;
GtkWidget *open_with_menu = gtk_menu_new();
GtkWidget *open_with_window_menu = gtk_menu_new();
gtk_menu_item_set_submenu (GTK_MENU_ITEM (gtk_ui_manager_get_widget ( window->priv->ui_manager, "/image-viewer-menu/open-with-menu")), open_with_menu);
......@@ -899,13 +900,13 @@ rstto_main_window_image_list_iter_changed (RsttoMainWindow *window)
if (NULL != app_list)
{
for (iter = app_list; iter; iter = g_list_next (iter))
{
GtkWidget *menu_item = rstto_app_menu_item_new (iter->data, rstto_file_get_file (cur_file));
gtk_menu_shell_append (GTK_MENU_SHELL (open_with_menu), menu_item);
menu_item = rstto_app_menu_item_new (iter->data, rstto_file_get_file (cur_file));
gtk_menu_shell_append (GTK_MENU_SHELL (open_with_window_menu), menu_item);
}
for (iter = app_list; iter; iter = g_list_next (iter))
{
GtkWidget *menu_item = rstto_app_menu_item_new (iter->data, rstto_file_get_file (cur_file));
gtk_menu_shell_append (GTK_MENU_SHELL (open_with_menu), menu_item);
menu_item = rstto_app_menu_item_new (iter->data, rstto_file_get_file (cur_file));
gtk_menu_shell_append (GTK_MENU_SHELL (open_with_window_menu), menu_item);
}
}
else
{
......@@ -924,11 +925,6 @@ rstto_main_window_image_list_iter_changed (RsttoMainWindow *window)
{
title = g_strdup_printf ("%s - %s", RISTRETTO_APP_TITLE, file_basename);
}
if (width > 0)
{
status = g_strdup_printf ("%d x %d", width, height);
}
}
else
{
......@@ -2106,9 +2102,6 @@ cb_rstto_main_window_pause (GtkWidget *widget, RsttoMainWindow *window)
static gboolean
cb_rstto_main_window_play_slideshow (RsttoMainWindow *window)
{
RsttoImageListIter *preload_iter = NULL;
GValue max_size = {0,};
if (window->priv->playing)
{
rstto_image_list_iter_next (window->priv->iter);
......@@ -2247,7 +2240,10 @@ cb_rstto_main_window_quit (GtkWidget *widget, RsttoMainWindow *window)
*
*/
static void
cb_rstto_main_window_image_list_new_image (RsttoImageList *image_list, GFile *file, RsttoMainWindow *window)
cb_rstto_main_window_image_list_new_image (
RsttoImageList *image_list,
RsttoFile *file,
RsttoMainWindow *window )
{
if (rstto_image_list_iter_get_position (window->priv->iter) == -1)
rstto_image_list_iter_set_position (window->priv->iter, 0);
......@@ -2497,7 +2493,6 @@ cb_rstto_main_window_open_image (GtkWidget *widget, RsttoMainWindow *window)
GFileEnumerator *file_enumarator = NULL;
GSList *files = NULL, *_files_iter;
GValue current_uri_val = {0, };
gint pos = 0;
GtkFileFilter *filter;
GFileInfo *file_info;
const gchar *filename;
......@@ -2540,7 +2535,6 @@ cb_rstto_main_window_open_image (GtkWidget *widget, RsttoMainWindow *window)
{
files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (dialog));
_files_iter = files;
pos = rstto_image_list_iter_get_position (window->priv->iter);
if (g_slist_length (files) > 1)
{
while (_files_iter)
......@@ -2553,8 +2547,8 @@ cb_rstto_main_window_open_image (GtkWidget *widget, RsttoMainWindow *window)
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
_("Could not open file"));
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
gtk_dialog_run(GTK_DIALOG(err_dialog));
gtk_widget_destroy(err_dialog);
}
else
{
......@@ -2627,32 +2621,30 @@ cb_rstto_main_window_open_recent(GtkRecentChooser *chooser, RsttoMainWindow *win
GFile *file = g_file_new_for_uri (uri);
GFile *child_file, *p_file;
GFileEnumerator *file_enumarator = NULL;
GFileInfo *child_file_info = NULL;
GFileInfo *file_info = g_file_query_info (file, "standard::type", 0, NULL, &error);
gint pos = 0;
RsttoFile *rfile;
if (error == NULL)
{
rfile = rstto_file_new (file);
g_object_ref (rfile);
if (rstto_image_list_add_file (window->priv->props.image_list, rfile, NULL) == TRUE )
{
rstto_image_list_remove_all (window->priv->props.image_list);
rstto_image_list_add_file (window->priv->props.image_list, rfile, NULL);
}
p_file = g_file_get_parent (file);
file_enumarator = g_file_enumerate_children (p_file, "standard::*", 0, NULL, NULL);
for(file_info = g_file_enumerator_next_file (file_enumarator, NULL, NULL); file_info != NULL; file_info = g_file_enumerator_next_file (file_enumarator, NULL, NULL))
{
filename = g_file_info_get_name (file_info);
content_type = g_file_info_get_content_type (file_info);
child_file = g_file_get_child (p_file, filename);
if (strncmp (content_type, "image/", 6) == 0)
{
rstto_image_list_add_file (window->priv->props.image_list, rstto_file_new (child_file), NULL);
}
}
rfile = rstto_file_new (file);
g_object_ref (rfile);
if (rstto_image_list_add_file (window->priv->props.image_list, rfile, NULL) == TRUE )
{
rstto_image_list_remove_all (window->priv->props.image_list);
rstto_image_list_add_file (window->priv->props.image_list, rfile, NULL);
}
p_file = g_file_get_parent (file);
file_enumarator = g_file_enumerate_children (p_file, "standard::*", 0, NULL, NULL);
for(file_info = g_file_enumerator_next_file (file_enumarator, NULL, NULL); file_info != NULL; file_info = g_file_enumerator_next_file (file_enumarator, NULL, NULL))
{
filename = g_file_info_get_name (file_info);
content_type = g_file_info_get_content_type (file_info);
child_file = g_file_get_child (p_file, filename);
if (strncmp (content_type, "image/", 6) == 0)
{
rstto_image_list_add_file (window->priv->props.image_list, rstto_file_new (child_file), NULL);
}
}
rstto_image_list_iter_find_file (
window->priv->iter,
rfile );
......@@ -2983,7 +2975,7 @@ cb_rstto_main_window_clear_private_data (GtkWidget *widget, RsttoMainWindow *win
GtkRecentFilter *recent_filter;
gsize n_uris = 0;
gchar **uris = NULL;
gint i = 0;
guint i = 0;
GtkWidget *dialog = rstto_privacy_dialog_new (GTK_WINDOW (window), window->priv->recent_manager);
......
src/monitor_chooser.c
View file @ 8a374788
......@@ -127,11 +127,9 @@ rstto_monitor_chooser_class_init(RsttoMonitorChooserClass *chooser_class)
{
GtkWidgetClass *widget_class;
GObjectClass *object_class;
GtkButtonClass *button_class;
widget_class = (GtkWidgetClass*)chooser_class;
object_class = (GObjectClass*)chooser_class;
button_class = (GtkButtonClass*)chooser_class;
parent_class = g_type_class_peek_parent(chooser_class);
......@@ -157,7 +155,6 @@ rstto_monitor_chooser_class_init(RsttoMonitorChooserClass *chooser_class)
static void
rstto_monitor_chooser_finalize(GObject *object)
{
RsttoMonitorChooser *chooser = RSTTO_MONITOR_CHOOSER(object);
}
/**
......@@ -237,11 +234,6 @@ rstto_monitor_chooser_paint(GtkWidget *widget)
gint row_width = 0;
gint id = 0;
GdkPixbuf *pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(),
"image-missing",
128,
0,
NULL);
gdk_window_clear (widget->window);
if (g_slist_length (chooser->priv->monitors) > 1)
......@@ -513,7 +505,7 @@ paint_monitor ( cairo_t *cr,
}
GtkWidget *
rstto_monitor_chooser_new ()
rstto_monitor_chooser_new ( void )
{
RsttoMonitorChooser *chooser;
......@@ -586,7 +578,7 @@ cb_rstto_button_press_event (
width = widget->allocation.width*(0.4/((gdouble)row_width+1));
height = width;
for (id = 0; id < g_slist_length(chooser->priv->monitors); ++id)
for (id = 0; id < (gint)g_slist_length(chooser->priv->monitors); ++id)
{
if ( (event->x > ((gdouble)widget->allocation.width/2)+
(((gdouble)widget->allocation.width/2)/
......
src/preferences_dialog.c
View file @ 8a374788
......@@ -149,14 +149,12 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog)
gboolean bool_bgcolor_override;
guint uint_slideshow_timeout;
gboolean bool_hide_thumbnailbar_fullscreen;
gboolean bool_show_preview;
gboolean bool_wrap_images;
gboolean bool_maximize_on_startup;
gboolean bool_merge_toolbars;
GdkColor *bgcolor;
GtkWidget *timeout_lbl, *timeout_hscale;
GtkObject *cache_adjustment;
GtkWidget *display_main_vbox;
GtkWidget *display_main_lbl;
GtkWidget *slideshow_main_vbox;
......@@ -165,8 +163,6 @@ rstto_preferences_dialog_init(RsttoPreferencesDialog *dialog)
GtkWidget *control_main_lbl;
GtkWidget *behaviour_main_vbox;
GtkWidget *behaviour_main_lbl;
GtkWidget *cache_main_vbox;
GtkWidget *cache_main_lbl;
GtkWidget *notebook = gtk_notebook_new ();
......
src/privacy_dialog.c
View file @ 8a374788
......@@ -113,8 +113,6 @@ rstto_privacy_dialog_get_type (void)
NULL
};
rstto_privacy_dialog_type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "RsttoPrivacyDialog", &rstto_privacy_dialog_info, 0);
static const GInterfaceInfo recent_chooser_info =
{
(GInterfaceInitFunc) rstto_recent_chooser_init,
......@@ -122,6 +120,8 @@ rstto_privacy_dialog_get_type (void)
NULL
};
rstto_privacy_dialog_type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "RsttoPrivacyDialog", &rstto_privacy_dialog_info, 0);
g_type_add_interface_static (rstto_privacy_dialog_type, GTK_TYPE_RECENT_CHOOSER, &recent_chooser_info);
}
return rstto_privacy_dialog_type;
......
src/properties_dialog.c
View file @ 8a374788
......@@ -115,7 +115,6 @@ rstto_properties_dialog_init (RsttoPropertiesDialog *dialog)
GtkWidget *modified_label = gtk_label_new(NULL);
GtkWidget *accessed_label = gtk_label_new(NULL);
GtkWidget *created_label = gtk_label_new(NULL);
GtkWidget *size_label = gtk_label_new(NULL);
......
src/thumbnail.c
View file @ 8a374788
......@@ -206,18 +206,15 @@ rstto_thumbnail_expose(GtkWidget *widget, GdkEventExpose *event)
{
gint height = gdk_pixbuf_get_height (thumb->priv->pixbuf) - 10;
gint width = gdk_pixbuf_get_width (thumb->priv->pixbuf) - 10;
gdouble scale = 1.0;
GdkPixbuf *dst_thumb_pixbuf = NULL;
if (gdk_pixbuf_get_width (thumb_pixbuf) > gdk_pixbuf_get_height (thumb_pixbuf))
{
height = (gint)(((gdouble)gdk_pixbuf_get_height (thumb_pixbuf) / (gdouble)gdk_pixbuf_get_width (thumb_pixbuf)) * width);
scale = ((gdouble)width / (gdouble)gdk_pixbuf_get_width (thumb_pixbuf));
}
else
{
width = (gint)(((gdouble)gdk_pixbuf_get_width (thumb_pixbuf) / (gdouble)gdk_pixbuf_get_height (thumb_pixbuf)) * height);
scale = ((gdouble)height / (gdouble)gdk_pixbuf_get_height (thumb_pixbuf));
}
gdk_pixbuf_fill (thumb->priv->pixbuf, 0x00000000);
......
src/thumbnail_bar.c
View file @ 8a374788
......@@ -250,8 +250,6 @@ rstto_thumbnail_bar_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
GtkRequisition child_requisition;
GList *iter = bar->priv->thumbs;
GFile *file = NULL;
gtk_widget_style_get(widget, "spacing", &spacing, NULL);
widget->allocation = *allocation;
......@@ -397,7 +395,6 @@ rstto_thumbnail_bar_expose(GtkWidget *widget, GdkEventExpose *ex)
GdkGC *gc = gdk_gc_new(GDK_DRAWABLE(widget->window));
gint border_width = GTK_CONTAINER(bar)->border_width;
gint i = 0;
GdkColor color, dot_color, bar_color;
color.red= 0;
color.green= 0;
......@@ -938,7 +935,10 @@ cb_rstto_thumbnail_bar_image_list_remove_all (RsttoImageList *image_list, gpoint
static void
cb_rstto_thumbnail_bar_thumbnail_clicked (GtkWidget *thumb, RsttoThumbnailBar *bar)
{
RsttoFile *file;
g_return_if_fail (bar->priv->iter);
RsttoFile *file = rstto_thumbnail_get_file (RSTTO_THUMBNAIL(thumb));
file = rstto_thumbnail_get_file (RSTTO_THUMBNAIL(thumb));
rstto_image_list_iter_find_file (bar->priv->iter, file);
}
src/thumbnailer.c
View file @ 8a374788
......@@ -173,8 +173,6 @@ rstto_thumbnailer_init (GObject *object)
static void
rstto_thumbnailer_class_init (GObjectClass *object_class)
{
GParamSpec *pspec;
RsttoThumbnailerClass *thumbnailer_class = RSTTO_THUMBNAILER_CLASS (
object_class);
......@@ -246,8 +244,6 @@ rstto_thumbnailer_set_property (
const GValue *value,
GParamSpec *pspec)
{
RsttoThumbnailer *thumbnailer = RSTTO_THUMBNAILER (object);
switch (property_id)
{
default:
......@@ -263,8 +259,6 @@ rstto_thumbnailer_get_property (
GValue *value,
GParamSpec *pspec)
{
RsttoThumbnailer *thumbnailer = RSTTO_THUMBNAILER (object);
switch (property_id)
{
default:
......@@ -420,7 +414,6 @@ cb_rstto_thumbnailer_thumbnail_ready (
RsttoThumbnail *thumbnail;
RsttoFile *file;
GSList *iter = thumbnailer->priv->queue;
GSList *prev;
gint x = 0;
const gchar *f_uri;
while (iter)
......
src/wallpaper_manager.c
View file @ 8a374788
......@@ -55,7 +55,6 @@ rstto_wallpaper_manager_set (
static void
rstto_wallpaper_manager_iface_init (gpointer g_iface)
{
RsttoWallpaperManagerIface *iface = (RsttoWallpaperManagerIface *)g_iface;
}
......
src/xfce_wallpaper_manager.c
View file @ 8a374788
......@@ -287,6 +287,21 @@ static void
rstto_xfce_wallpaper_manager_init (GObject *object)
{
RsttoXfceWallpaperManager *manager = RSTTO_XFCE_WALLPAPER_MANAGER (object);
gint i;
GdkScreen *screen = gdk_screen_get_default ();
gint n_monitors = gdk_screen_get_n_monitors (screen);
GdkRectangle monitor_geometry;
GtkWidget *vbox = gtk_dialog_get_content_area (
GTK_DIALOG (manager->priv->dialog));
GtkWidget *style_label = gtk_label_new( _("Style:"));
GtkWidget *brightness_label = gtk_label_new( _("Brightness:"));
GtkWidget *saturation_label = gtk_label_new( _("Saturation:"));
GtkWidget *brightness_slider = gtk_hscale_new (
GTK_ADJUSTMENT (manager->priv->brightness_adjustment));
GtkWidget *saturation_slider = gtk_hscale_new (
GTK_ADJUSTMENT (manager->priv->saturation_adjustment));
GtkWidget *image_prop_table = gtk_table_new (3, 2, FALSE);
manager->priv = g_new0(RsttoXfceWallpaperManagerPriv, 1);
manager->priv->channel = xfconf_channel_new ("xfce4-desktop");
......@@ -298,11 +313,6 @@ rstto_xfce_wallpaper_manager_init (GObject *object)
manager->priv->brightness = 0;
manager->priv->saturation = 1.0;
gint i;
gchar *str = NULL;
GdkScreen *screen = gdk_screen_get_default ();
gint n_monitors = gdk_screen_get_n_monitors (screen);
GdkRectangle monitor_geometry;
manager->priv->dialog = gtk_dialog_new_with_buttons (
_("Set as wallpaper"),
NULL,
......@@ -314,12 +324,6 @@ rstto_xfce_wallpaper_manager_init (GObject *object)
GTK_STOCK_OK,
GTK_RESPONSE_OK,
NULL);
GtkWidget *vbox = gtk_dialog_get_content_area (
GTK_DIALOG (manager->priv->dialog));
GtkWidget *style_label = gtk_label_new( _("Style:"));
GtkWidget *monitor_label = gtk_label_new( _("Monitor:"));
GtkWidget *brightness_label = gtk_label_new( _("Brightness:"));
GtkWidget *saturation_label = gtk_label_new( _("Saturation:"));
manager->priv->brightness_adjustment = gtk_adjustment_new (
0.0,
-128.0,
......@@ -334,18 +338,6 @@ rstto_xfce_wallpaper_manager_init (GObject *object)
0.1,
0.5,
0.0);
GtkWidget *brightness_slider = gtk_hscale_new (
GTK_ADJUSTMENT (manager->priv->brightness_adjustment));
GtkWidget *saturation_slider = gtk_hscale_new (
GTK_ADJUSTMENT (manager->priv->saturation_adjustment));
GdkPixbuf *image_pixbuf = gtk_icon_theme_load_icon (
gtk_icon_theme_get_default(),
"image-missing",
128,
0,
NULL);
GtkWidget *image_prop_table = gtk_table_new (3, 2, FALSE);
manager->priv->monitor_chooser = rstto_monitor_chooser_new ();
manager->priv->style_combo = gtk_combo_box_new_text();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment