attempt to port to gtk3
Chris Lee @klee93
8 files changed,
281 insertions(+),
318 deletions(-)
M
packaging/debian/control
→
packaging/debian/control
@@ -6,7 +6,7 @@ Build-Depends: cmake,
debhelper (>= 9), libcairo2-dev, libglib2.0-dev, - libgtk2.0-dev, + libgtk-3-dev, libimlib2-dev, libpango1.0-dev, librsvg2-dev,
M
src/tint2conf/CMakeLists.txt
→
src/tint2conf/CMakeLists.txt
@@ -7,7 +7,7 @@ pkg_check_modules( GLIB2 REQUIRED glib-2.0 )
pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 ) pkg_check_modules( IMLIB2 REQUIRED imlib2 ) pkg_check_modules( GTHREAD2 REQUIRED gthread-2.0 ) -pkg_check_modules( GTK2 REQUIRED gtk+-x11-2.0 ) +pkg_check_modules( GTK3 REQUIRED gtk+-x11-3.0 ) pkg_check_modules( RSVG librsvg-2.0>=2.36.0 ) include_directories( ../util@@ -16,7 +16,7 @@ ${GLIB2_INCLUDE_DIRS}
${GOBJECT2_INCLUDE_DIRS} ${IMLIB2_INCLUDE_DIRS} ${GTHREAD2_INCLUDE_DIRS} - ${GTK2_INCLUDE_DIRS} + ${GTK3_INCLUDE_DIRS} ${RSVG_INCLUDE_DIRS} ) set(SOURCES ../util/common.c@@ -55,7 +55,7 @@ ${GLIB2_LIBRARY_DIRS}
${GOBJECT2_LIBRARY_DIRS} ${IMLIB2_LIBRARY_DIRS} ${GTHREAD2_LIBRARY_DIRS} - ${GTK2_LIBRARY_DIRS} + ${GTK3_LIBRARY_DIRS} ${RSVG_LIBRARY_DIRS} ) add_executable( tint2conf ${SOURCES} ) target_link_libraries( tint2conf ${X11_T2C_LIBRARIES}@@ -63,13 +63,14 @@ ${GLIB2_LIBRARIES}
${GOBJECT2_LIBRARIES} ${IMLIB2_LIBRARIES} ${GTHREAD2_LIBRARIES} - ${GTK2_LIBRARIES} + ${GTK3_LIBRARIES} ${RSVG_LIBRARIES} ) add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" ) add_definitions( -DLOCALEDIR=\"${CMAKE_INSTALL_FULL_LOCALEDIR}\" ) add_definitions( -DGETTEXT_PACKAGE=\"tint2conf\" ) -set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -pthread -std=c99" ) +add_definitions( -DDGLIB_DISABLE_DEPRECATION_WARNINGS=1 ) +set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Wpointer-arith -fno-strict-aliasing -pthread -std=c99 -Werror-implicit-function-declaration -Wno-deprecated -Wno-deprecated-declarations" ) set_target_properties( tint2conf PROPERTIES LINK_FLAGS "-pthread" ) add_subdirectory(po)
M
src/tint2conf/background_gui.c
→
src/tint2conf/background_gui.c
@@ -95,7 +95,7 @@ {
backgrounds = gtk_list_store_new(bgNumCols, GDK_TYPE_PIXBUF, GDK_TYPE_COLOR, - GTK_TYPE_INT, + GTK_TYPE_SHADOW_TYPE, GDK_TYPE_COLOR, GTK_TYPE_INT, GTK_TYPE_INT,@@ -121,7 +121,6 @@ GTK_TYPE_DOUBLE);
GtkWidget *table, *label, *button; int row, col; - GtkTooltips *tooltips = gtk_tooltips_new(); table = gtk_table_new(1, 4, FALSE); gtk_widget_show(table);@@ -141,21 +140,21 @@ current_background = create_background_combo(NULL);
gtk_widget_show(current_background); gtk_table_attach(GTK_TABLE(table), current_background, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, current_background, _("Selects the background you would like to modify"), NULL); + gtk_widget_set_tooltip_text(current_background, _("Selects the background you would like to modify")); button = gtk_button_new_from_stock("gtk-add"); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(background_duplicate), NULL); + g_signal_connect(button, "clicked", G_CALLBACK(background_duplicate), NULL); gtk_widget_show(button); gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, button, _("Creates a copy of the current background"), NULL); + gtk_widget_set_tooltip_text(button, _("Creates a copy of the current background")); button = gtk_button_new_from_stock("gtk-remove"); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(background_delete), NULL); + g_signal_connect(button, "clicked", G_CALLBACK(background_delete), NULL); gtk_widget_show(button); gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, button, _("Deletes the current background"), NULL); + gtk_widget_set_tooltip_text(button, _("Deletes the current background")); table = gtk_table_new(4, 4, FALSE); gtk_widget_show(table);@@ -175,7 +174,7 @@ gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(background_fill_color), TRUE);
gtk_widget_show(background_fill_color); gtk_table_attach(GTK_TABLE(table), background_fill_color, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, background_fill_color, _("The fill color of the current background"), NULL); + gtk_widget_set_tooltip_text(background_fill_color, _("The fill color of the current background")); row++, col = 2; label = gtk_label_new(_("Fill tint"));@@ -188,7 +187,7 @@ background_fill_content_tint_weight = gtk_spin_button_new_with_range(0, 100, 1);
gtk_widget_show(background_fill_content_tint_weight); gtk_table_attach(GTK_TABLE(table), background_fill_content_tint_weight, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, background_fill_content_tint_weight, _("How much the border color should be tinted with the content color"), NULL); + gtk_widget_set_tooltip_text(background_fill_content_tint_weight, _("How much the border color should be tinted with the content color")); row++, col = 2; label = gtk_label_new(_("Border color"));@@ -202,7 +201,7 @@ gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(background_border_color), TRUE);
gtk_widget_show(background_border_color); gtk_table_attach(GTK_TABLE(table), background_border_color, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, background_border_color, _("The border color of the current background"), NULL); + gtk_widget_set_tooltip_text(background_border_color, _("The border color of the current background")); row++, col = 2; label = gtk_label_new(_("Border tint"));@@ -215,7 +214,7 @@ background_border_content_tint_weight = gtk_spin_button_new_with_range(0, 100, 1);
gtk_widget_show(background_border_content_tint_weight); gtk_table_attach(GTK_TABLE(table), background_border_content_tint_weight, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, background_border_content_tint_weight, _("How much the border color should be tinted with the content color"), NULL); + gtk_widget_set_tooltip_text(background_border_content_tint_weight, _("How much the border color should be tinted with the content color")); row++, col = 2; label = gtk_label_new(_("Gradient"));@@ -241,10 +240,8 @@ gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(background_fill_color_over), TRUE);
gtk_widget_show(background_fill_color_over); gtk_table_attach(GTK_TABLE(table), background_fill_color_over, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - background_fill_color_over, - _("The fill color of the current background on mouse over"), - NULL); + gtk_widget_set_tooltip_text(background_fill_color_over, + _("The fill color of the current background on mouse over")); row++, col = 2; label = gtk_label_new(_("Border color (mouse over)"));@@ -258,10 +255,9 @@ gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(background_border_color_over), TRUE);
gtk_widget_show(background_border_color_over); gtk_table_attach(GTK_TABLE(table), background_border_color_over, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, + gtk_widget_set_tooltip_text( background_border_color_over, - _("The border color of the current background on mouse over"), - NULL); + _("The border color of the current background on mouse over")); row++, col = 2; label = gtk_label_new(_("Gradient (mouse over)"));@@ -287,10 +283,8 @@ gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(background_fill_color_press), TRUE);
gtk_widget_show(background_fill_color_press); gtk_table_attach(GTK_TABLE(table), background_fill_color_press, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - background_fill_color_press, - _("The fill color of the current background on mouse button press"), - NULL); + gtk_widget_set_tooltip_text(background_fill_color_press, + _("The fill color of the current background on mouse button press")); row++, col = 2; label = gtk_label_new(_("Border color (pressed)"));@@ -304,10 +298,8 @@ gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(background_border_color_press), TRUE);
gtk_widget_show(background_border_color_press); gtk_table_attach(GTK_TABLE(table), background_border_color_press, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - background_border_color_press, - _("The border color of the current background on mouse button press"), - NULL); + gtk_widget_set_tooltip_text(background_border_color_press, + _("The border color of the current background on mouse button press")); row++, col = 2; label = gtk_label_new(_("Gradient (pressed)"));@@ -332,10 +324,8 @@ background_border_width = gtk_spin_button_new_with_range(0, 100, 1);
gtk_widget_show(background_border_width); gtk_table_attach(GTK_TABLE(table), background_border_width, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - background_border_width, - _("The width of the border of the current background, in pixels"), - NULL); + gtk_widget_set_tooltip_text(background_border_width, + _("The width of the border of the current background, in pixels")); row++, col = 2; label = gtk_label_new(_("Corner radius"));@@ -348,7 +338,7 @@ background_corner_radius = gtk_spin_button_new_with_range(0, 100, 1);
gtk_widget_show(background_corner_radius); gtk_table_attach(GTK_TABLE(table), background_corner_radius, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, background_corner_radius, _("The corner radius of the current background"), NULL); + gtk_widget_set_tooltip_text(background_corner_radius, _("The corner radius of the current background")); row++; col = 2;@@ -712,9 +702,8 @@
g_boxed_free(GDK_TYPE_COLOR, fillColor); g_boxed_free(GDK_TYPE_COLOR, borderColor); - GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24); - - cairo_t *cr = gdk_cairo_create(pixmap); + cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_RGB24, w, h); + cairo_t *cr = cairo_create(s); cairo_set_line_width(cr, b); cairo_set_source_rgb(cr, 0.5, 0.5, 0.5);@@ -744,13 +733,12 @@ cairo_stroke(cr);
cairo_destroy(cr); cr = NULL; - pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap, gdk_colormap_get_system(), 0, 0, 0, 0, w, h); - if (pixmap) - g_object_unref(pixmap); + pixbuf = gdk_pixbuf_get_from_surface(s, 0, 0, w, h); gtk_list_store_set(backgrounds, &iter, bgColPixbuf, pixbuf, -1); if (pixbuf) g_object_unref(pixbuf); + cairo_surface_destroy(s); } void background_force_update()
M
src/tint2conf/gradient_gui.c
→
src/tint2conf/gradient_gui.c
@@ -32,7 +32,7 @@ }
void create_gradient(GtkWidget *parent) { - gradient_ids = gtk_list_store_new(grNumCols, GDK_TYPE_PIXBUF, GTK_TYPE_INT, GTK_TYPE_STRING); + gradient_ids = gtk_list_store_new(grNumCols, GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_STRING); gradients = NULL; gradient_stop_ids = gtk_list_store_new(grStopNumCols, GDK_TYPE_PIXBUF);@@ -61,13 +61,13 @@ gtk_table_attach(GTK_TABLE(table), current_gradient, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
col++; button = gtk_button_new_from_stock("gtk-add"); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_duplicate), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_duplicate), NULL); gtk_widget_show(button); gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; button = gtk_button_new_from_stock("gtk-remove"); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_delete), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_delete), NULL); gtk_widget_show(button); gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++;@@ -85,13 +85,13 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gradient_combo_type = gtk_combo_box_new_text(); + gradient_combo_type = gtk_combo_box_text_new(); gtk_widget_show(gradient_combo_type); gtk_table_attach(GTK_TABLE(table), gradient_combo_type, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(gradient_combo_type), _("Vertical")); - gtk_combo_box_append_text(GTK_COMBO_BOX(gradient_combo_type), _("Horizontal")); - gtk_combo_box_append_text(GTK_COMBO_BOX(gradient_combo_type), _("Radial")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gradient_combo_type), _("Vertical")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gradient_combo_type), _("Horizontal")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(gradient_combo_type), _("Radial")); gtk_combo_box_set_active(GTK_COMBO_BOX(gradient_combo_type), 0); row++, col = 2;@@ -142,13 +142,13 @@ gtk_table_attach(GTK_TABLE(table), current_gradient_stop, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0);
col++; button = gtk_button_new_from_stock("gtk-add"); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_stop_duplicate), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_stop_duplicate), NULL); gtk_widget_show(button); gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; button = gtk_button_new_from_stock("gtk-remove"); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_stop_delete), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gradient_stop_delete), NULL); gtk_widget_show(button); gtk_table_attach(GTK_TABLE(table), button, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++;@@ -327,18 +327,17 @@ GradientConfig *g = (GradientConfig *)g_list_nth(gradients, (guint)index)->data;
int w = 70; int h = 30; - GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24); + cairo_surface_t *pixmap = cairo_image_surface_create(CAIRO_FORMAT_RGB24, w, h); - cairo_t *cr = gdk_cairo_create(pixmap); + cairo_t *cr = cairo_create(pixmap); cairo_set_source_rgb(cr, 0.5, 0.5, 0.5); cairo_rectangle(cr, 0, 0, w, h); cairo_fill(cr); gradient_draw(cr, g, w, h, FALSE); - GdkPixbuf *pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap, gdk_colormap_get_system(), 0, 0, 0, 0, w, h); - if (pixmap) - g_object_unref(pixmap); + GdkPixbuf *pixbuf = gdk_pixbuf_get_from_surface(pixmap, 0, 0, w, h); + cairo_surface_destroy(pixmap); GtkTreePath *path; GtkTreeIter iter;@@ -528,16 +527,14 @@ GradientConfigColorStop *stop = (GradientConfigColorStop *)g_list_nth(g->extra_color_stops, (guint)index)->data;
int w = 70; int h = 30; - GdkPixmap *pixmap = gdk_pixmap_new(NULL, w, h, 24); - - cairo_t *cr = gdk_cairo_create(pixmap); + cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_RGB24, w, h); + cairo_t *cr = cairo_create(s); cairo_set_source_rgba(cr, stop->color.rgb[0], stop->color.rgb[1], stop->color.rgb[2], stop->color.alpha); cairo_rectangle(cr, 0, 0, w, h); cairo_fill(cr); - GdkPixbuf *pixbuf = gdk_pixbuf_get_from_drawable(NULL, pixmap, gdk_colormap_get_system(), 0, 0, 0, 0, w, h); - if (pixmap) - g_object_unref(pixmap); + GdkPixbuf *pixbuf = gdk_pixbuf_get_from_surface(s, 0, 0, w, h); + cairo_surface_destroy(s); GtkTreePath *path; GtkTreeIter iter;
M
src/tint2conf/main.h
→
src/tint2conf/main.h
@@ -14,6 +14,27 @@ #define _(String) String
#define GETTEXT_PACKAGE "tint2conf" #endif +#ifndef GTK_TYPE_INT +#define GTK_TYPE_INT G_TYPE_INT +#endif + +#ifndef GTK_TYPE_STRING +#define GTK_TYPE_STRING G_TYPE_STRING +#endif + +#ifndef GTK_TYPE_BOOL +#define GTK_TYPE_BOOL G_TYPE_BOOLEAN +#endif + +#ifndef GTK_TYPE_DOUBLE +#define GTK_TYPE_DOUBLE G_TYPE_DOUBLE +#endif + +#define gtk_tooltips_set_tip(t, widget, txt, arg) gtk_widget_set_tooltip_text(widget, txt) + +#define GTK_OBJECT(x) (x) +#define GTK_SIGNAL_FUNC G_CALLBACK + #define SNAPSHOT_TICK 190 gboolean update_snapshot(gpointer ignored); void menuApply();
M
src/tint2conf/properties.c
→
src/tint2conf/properties.c
@@ -209,20 +209,16 @@ }
void font_set_callback(GtkWidget *widget, gpointer data) { - gtk_widget_set_sensitive(data, GTK_TOGGLE_BUTTON(widget)->active); + gtk_widget_set_sensitive(data, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))); } GtkWidget *create_properties() { GtkWidget *view, *dialog_vbox3, *button; - GtkTooltips *tooltips; GtkWidget *page_panel, *page_panel_items, *page_launcher, *page_taskbar, *page_battery, *page_clock, *page_tooltip, *page_systemtray, *page_task, *page_background, *page_gradient; GtkWidget *label; - tooltips = gtk_tooltips_new(); - (void)tooltips; - separators = g_array_new(FALSE, TRUE, sizeof(Separator)); executors = g_array_new(FALSE, TRUE, sizeof(Executor)); buttons = g_array_new(FALSE, TRUE, sizeof(Button));@@ -235,7 +231,7 @@ gtk_window_set_default_size(GTK_WINDOW(view), 920, 600);
gtk_window_set_skip_pager_hint(GTK_WINDOW(view), TRUE); gtk_window_set_type_hint(GTK_WINDOW(view), GDK_WINDOW_TYPE_HINT_DIALOG); - dialog_vbox3 = GTK_DIALOG(view)->vbox; + dialog_vbox3 = gtk_dialog_get_content_area(GTK_DIALOG(view)); gtk_widget_show(dialog_vbox3); notebook = gtk_notebook_new();@@ -247,20 +243,20 @@
button = gtk_button_new_from_stock("gtk-apply"); gtk_widget_show(button); gtk_dialog_add_action_widget(GTK_DIALOG(view), button, GTK_RESPONSE_APPLY); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(applyClicked), NULL); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + g_signal_connect(button, "clicked", G_CALLBACK(applyClicked), NULL); + gtk_widget_set_can_default(button, TRUE); button = gtk_button_new_from_stock("gtk-cancel"); gtk_widget_show(button); gtk_dialog_add_action_widget(GTK_DIALOG(view), button, GTK_RESPONSE_CANCEL); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(cancelClicked), view); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + g_signal_connect(button, "clicked", G_CALLBACK(cancelClicked), view); + gtk_widget_set_can_default(button, TRUE); button = gtk_button_new_from_stock("gtk-ok"); gtk_widget_show(button); gtk_dialog_add_action_widget(GTK_DIALOG(view), button, GTK_RESPONSE_OK); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(okClicked), view); - GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); + g_signal_connect(button, "clicked", G_CALLBACK(okClicked), view); + gtk_widget_set_can_default(button, TRUE); // notebook label = gtk_label_new(_("Gradients"));@@ -401,7 +397,6 @@ int i;
GtkWidget *table, *hbox, *position; GtkWidget *label; int row, col; - GtkTooltips *tooltips = gtk_tooltips_new(); label = gtk_label_new(_("<b>Geometry</b>")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0);@@ -441,29 +436,29 @@ gtk_widget_set_size_request(screen_position[i], 15, 25);
} } gtk_table_attach_defaults(GTK_TABLE(position), screen_position[0], 1, 2, 0, 1); - gtk_tooltips_set_tip(tooltips, screen_position[0], _("Position on screen: top-left, horizontal panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[0], _("Position on screen: top-left, horizontal panel")); gtk_table_attach_defaults(GTK_TABLE(position), screen_position[1], 2, 3, 0, 1); - gtk_tooltips_set_tip(tooltips, screen_position[1], _("Position on screen: top-center, horizontal panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[1], _("Position on screen: top-center, horizontal panel")); gtk_table_attach_defaults(GTK_TABLE(position), screen_position[2], 3, 4, 0, 1); - gtk_tooltips_set_tip(tooltips, screen_position[2], _("Position on screen: top-right, horizontal panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[2], _("Position on screen: top-right, horizontal panel")); gtk_table_attach_defaults(GTK_TABLE(position), screen_position[3], 0, 1, 1, 2); - gtk_tooltips_set_tip(tooltips, screen_position[3], _("Position on screen: top-left, vertical panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[3], _("Position on screen: top-left, vertical panel")); gtk_table_attach_defaults(GTK_TABLE(position), screen_position[4], 0, 1, 2, 3); - gtk_tooltips_set_tip(tooltips, screen_position[4], _("Position on screen: center-left, vertical panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[4], _("Position on screen: center-left, vertical panel")); gtk_table_attach_defaults(GTK_TABLE(position), screen_position[5], 0, 1, 3, 4); - gtk_tooltips_set_tip(tooltips, screen_position[5], _("Position on screen: bottom-left, vertical panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[5], _("Position on screen: bottom-left, vertical panel")); gtk_table_attach_defaults(GTK_TABLE(position), screen_position[6], 4, 5, 1, 2); - gtk_tooltips_set_tip(tooltips, screen_position[6], _("Position on screen: top-right, vertical panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[6], _("Position on screen: top-right, vertical panel")); gtk_table_attach_defaults(GTK_TABLE(position), screen_position[7], 4, 5, 2, 3); - gtk_tooltips_set_tip(tooltips, screen_position[7], _("Position on screen: center-right, vertical panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[7], _("Position on screen: center-right, vertical panel")); gtk_table_attach_defaults(GTK_TABLE(position), screen_position[8], 4, 5, 3, 4); - gtk_tooltips_set_tip(tooltips, screen_position[8], _("Position on screen: bottom-right, vertical panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[8], _("Position on screen: bottom-right, vertical panel")); gtk_table_attach_defaults(GTK_TABLE(position), screen_position[9], 1, 2, 4, 5); - gtk_tooltips_set_tip(tooltips, screen_position[9], _("Position on screen: bottom-left, horizontal panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[9], _("Position on screen: bottom-left, horizontal panel")); gtk_table_attach_defaults(GTK_TABLE(position), screen_position[10], 2, 3, 4, 5); - gtk_tooltips_set_tip(tooltips, screen_position[10], _("Position on screen: bottom-center, horizontal panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[10], _("Position on screen: bottom-center, horizontal panel")); gtk_table_attach_defaults(GTK_TABLE(position), screen_position[11], 3, 4, 4, 5); - gtk_tooltips_set_tip(tooltips, screen_position[11], _("Position on screen: bottom-right, horizontal panel"), NULL); + gtk_widget_set_tooltip_text(screen_position[11], _("Position on screen: bottom-right, horizontal panel")); gtk_table_attach(GTK_TABLE(table), position, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); row++;@@ -474,20 +469,20 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - panel_combo_monitor = gtk_combo_box_new_text(); + panel_combo_monitor = gtk_combo_box_text_new(); gtk_widget_show(panel_combo_monitor); gtk_table_attach(GTK_TABLE(table), panel_combo_monitor, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_monitor), _("All")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_monitor), _("Primary")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_monitor), _("1")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_monitor), _("2")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_monitor), _("3")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_monitor), _("4")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_monitor), _("5")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_monitor), _("6")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_monitor), _("All")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_monitor), _("Primary")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_monitor), _("1")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_monitor), _("2")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_monitor), _("3")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_monitor), _("4")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_monitor), _("5")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_monitor), _("6")); gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_monitor), 0); - gtk_tooltips_set_tip(tooltips, panel_combo_monitor, _("The monitor on which the panel is placed"), NULL); + gtk_widget_set_tooltip_text(panel_combo_monitor, _("The monitor on which the panel is placed")); row++; col = 2;@@ -501,23 +496,19 @@ panel_width = gtk_spin_button_new_with_range(0, 9000, 1);
gtk_widget_show(panel_width); gtk_table_attach(GTK_TABLE(table), panel_width, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - panel_width, - _("The length of the panel (width for horizontal panels, height for vertical panels)"), - NULL); + gtk_widget_set_tooltip_text(panel_width, + _("The length of the panel (width for horizontal panels, height for vertical panels)")); - panel_combo_width_type = gtk_combo_box_new_text(); + panel_combo_width_type = gtk_combo_box_text_new(); gtk_widget_show(panel_combo_width_type); gtk_table_attach(GTK_TABLE(table), panel_combo_width_type, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_width_type), _("Percent")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_width_type), _("Pixels")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_width_type), _("Percent")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_width_type), _("Pixels")); gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_width_type), 0); - gtk_tooltips_set_tip(tooltips, - panel_combo_width_type, + gtk_widget_set_tooltip_text(panel_combo_width_type, _("The units used to specify the length of the panel: pixels or percentage of the monitor " - "size"), - NULL); + "size")); row++; col = 2;@@ -544,22 +535,18 @@ panel_height = gtk_spin_button_new_with_range(0, 9000, 1);
gtk_widget_show(panel_height); gtk_table_attach(GTK_TABLE(table), panel_height, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - panel_height, - _("The size of the panel (height for horizontal panels, width for vertical panels)"), - NULL); + gtk_widget_set_tooltip_text(panel_height, + _("The size of the panel (height for horizontal panels, width for vertical panels)")); - panel_combo_height_type = gtk_combo_box_new_text(); + panel_combo_height_type = gtk_combo_box_text_new(); gtk_widget_show(panel_combo_height_type); gtk_table_attach(GTK_TABLE(table), panel_combo_height_type, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_height_type), _("Percent")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_height_type), _("Pixels")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_height_type), _("Percent")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_height_type), _("Pixels")); gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_height_type), 0); - gtk_tooltips_set_tip(tooltips, - panel_combo_height_type, - _("The units used to specify the size of the panel: pixels or percentage of the monitor size"), - NULL); + gtk_widget_set_tooltip_text(panel_combo_height_type, + _("The units used to specify the size of the panel: pixels or percentage of the monitor size")); row++; col = 2;@@ -573,13 +560,11 @@ panel_margin_x = gtk_spin_button_new_with_range(0, 500, 1);
gtk_widget_show(panel_margin_x); gtk_table_attach(GTK_TABLE(table), panel_margin_x, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - panel_margin_x, + gtk_widget_set_tooltip_text(panel_margin_x, _("Creates a space between the panel and the edge of the monitor. " "For left-aligned panels, the space is created on the right of the panel; " "for right-aligned panels, it is created on the left; " - "for centered panels, it is evenly distributed on both sides of the panel."), - NULL); + "for centered panels, it is evenly distributed on both sides of the panel.")); row++; col = 2;@@ -593,13 +578,11 @@ panel_margin_y = gtk_spin_button_new_with_range(0, 500, 1);
gtk_widget_show(panel_margin_y); gtk_table_attach(GTK_TABLE(table), panel_margin_y, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - panel_margin_y, + gtk_widget_set_tooltip_text(panel_margin_y, _("Creates a space between the panel and the edge of the monitor. " "For top-aligned panels, the space is created on the bottom of the panel; " "for bottom-aligned panels, it is created on the top; " - "for centered panels, it is evenly distributed on both sides of the panel."), - NULL); + "for centered panels, it is evenly distributed on both sides of the panel.")); row++; col = 2;@@ -653,11 +636,9 @@ panel_background = create_background_combo(_("Panel"));
gtk_widget_show(panel_background); gtk_table_attach(GTK_TABLE(table), panel_background, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - panel_background, + gtk_widget_set_tooltip_text(panel_background, _("Selects the background used to display the panel. " - "Backgrounds can be edited in the Backgrounds tab."), - NULL); + "Backgrounds can be edited in the Backgrounds tab.")); row++; col = 2;@@ -671,11 +652,9 @@ panel_padding_x = gtk_spin_button_new_with_range(0, 500, 1);
gtk_widget_show(panel_padding_x); gtk_table_attach(GTK_TABLE(table), panel_padding_x, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - panel_padding_x, + gtk_widget_set_tooltip_text(panel_padding_x, _("Specifies the horizontal padding of the panel. " - "This is the space between the border of the panel and the elements inside."), - NULL); + "This is the space between the border of the panel and the elements inside.")); row++; col = 2;@@ -689,11 +668,9 @@ panel_padding_y = gtk_spin_button_new_with_range(0, 500, 1);
gtk_widget_show(panel_padding_y); gtk_table_attach(GTK_TABLE(table), panel_padding_y, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - panel_padding_y, + gtk_widget_set_tooltip_text(panel_padding_y, _("Specifies the vertical padding of the panel. " - "This is the space between the border of the panel and the elements inside."), - NULL); + "This is the space between the border of the panel and the elements inside.")); row++; col = 2;@@ -707,7 +684,7 @@ panel_spacing = gtk_spin_button_new_with_range(0, 500, 1);
gtk_widget_show(panel_spacing); gtk_table_attach(GTK_TABLE(table), panel_spacing, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, panel_spacing, _("Specifies the spacing between elements inside the panel."), NULL); + gtk_widget_set_tooltip_text(panel_spacing, _("Specifies the spacing between elements inside the panel.")); row++; col = 2;@@ -721,11 +698,9 @@ disable_transparency = gtk_check_button_new();
gtk_widget_show(disable_transparency); gtk_table_attach(GTK_TABLE(table), disable_transparency, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - disable_transparency, + gtk_widget_set_tooltip_text(disable_transparency, _("If enabled, the compositor will not be used to draw a transparent panel. " - "May fix display corruption problems on broken graphics stacks."), - NULL); + "May fix display corruption problems on broken graphics stacks.")); row++, col = 2; label = gtk_label_new(_("Font shadows"));@@ -738,11 +713,9 @@ font_shadow = gtk_check_button_new();
gtk_widget_show(font_shadow); gtk_table_attach(GTK_TABLE(table), font_shadow, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - font_shadow, + gtk_widget_set_tooltip_text(font_shadow, _("If enabled, a shadow will be drawn behind text. " - "This may improve legibility on transparent panels."), - NULL); + "This may improve legibility on transparent panels.")); row++; col = 2;@@ -756,10 +729,8 @@ panel_mouse_effects = gtk_check_button_new();
gtk_widget_show(panel_mouse_effects); gtk_table_attach(GTK_TABLE(table), panel_mouse_effects, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - panel_mouse_effects, - _("Clickable interface items change appearance when the mouse is moved over them."), - NULL); + gtk_widget_set_tooltip_text(panel_mouse_effects, + _("Clickable interface items change appearance when the mouse is moved over them.")); row++; col = 2;@@ -774,10 +745,8 @@ gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_hover_icon_opacity), 100);
gtk_widget_show(mouse_hover_icon_opacity); gtk_table_attach(GTK_TABLE(table), mouse_hover_icon_opacity, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - mouse_hover_icon_opacity, - _("Specifies the opacity adjustment of the icons under the mouse, in percent."), - NULL); + gtk_widget_set_tooltip_text(mouse_hover_icon_opacity, + _("Specifies the opacity adjustment of the icons under the mouse, in percent.")); row++; col = 2;@@ -792,10 +761,8 @@ gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_hover_icon_saturation), 0);
gtk_widget_show(mouse_hover_icon_saturation); gtk_table_attach(GTK_TABLE(table), mouse_hover_icon_saturation, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - mouse_hover_icon_saturation, - _("Specifies the saturation adjustment of the icons under the mouse, in percent."), - NULL); + gtk_widget_set_tooltip_text(mouse_hover_icon_saturation, + _("Specifies the saturation adjustment of the icons under the mouse, in percent.")); row++; col = 2;@@ -810,10 +777,8 @@ gtk_spin_button_set_value(GTK_SPIN_BUTTON(mouse_hover_icon_brightness), 10);
gtk_widget_show(mouse_hover_icon_brightness); gtk_table_attach(GTK_TABLE(table), mouse_hover_icon_brightness, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, - mouse_hover_icon_brightness, - _("Specifies the brightness adjustment of the icons under the mouse, in percent."), - NULL); + gtk_widget_set_tooltip_text(mouse_hover_icon_brightness, + _("Specifies the brightness adjustment of the icons under the mouse, in percent.")); row++; col = 2;@@ -1044,13 +1009,13 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - panel_combo_layer = gtk_combo_box_new_text(); + panel_combo_layer = gtk_combo_box_text_new(); gtk_widget_show(panel_combo_layer); gtk_table_attach(GTK_TABLE(table), panel_combo_layer, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_layer), _("Top")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_layer), _("Normal")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_layer), _("Bottom")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_layer), _("Top")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_layer), _("Normal")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_layer), _("Bottom")); gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_layer), 1); gtk_tooltips_set_tip(tooltips, panel_combo_layer,@@ -1071,13 +1036,13 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - panel_combo_strut_policy = gtk_combo_box_new_text(); + panel_combo_strut_policy = gtk_combo_box_text_new(); gtk_widget_show(panel_combo_strut_policy); gtk_table_attach(GTK_TABLE(table), panel_combo_strut_policy, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_strut_policy), _("Match the panel size")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_strut_policy), _("Match the hidden panel size")); - gtk_combo_box_append_text(GTK_COMBO_BOX(panel_combo_strut_policy), _("Fill the screen")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_strut_policy), _("Match the panel size")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_strut_policy), _("Match the hidden panel size")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(panel_combo_strut_policy), _("Fill the screen")); gtk_combo_box_set_active(GTK_COMBO_BOX(panel_combo_strut_policy), 0); gtk_tooltips_set_tip(tooltips, panel_combo_strut_policy,@@ -1122,7 +1087,6 @@
void create_panel_items(GtkWidget *parent) { GtkWidget *table, *label, *button, *image; - GtkTooltips *tooltips = gtk_tooltips_new(); panel_items = gtk_list_store_new(itemsNumCols, G_TYPE_STRING, G_TYPE_STRING); all_items = gtk_list_store_new(itemsNumCols, G_TYPE_STRING, G_TYPE_STRING);@@ -1212,18 +1176,18 @@
button = gtk_button_new(); image = gtk_image_new_from_stock(GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(button), image); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(panel_move_item_up), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(panel_move_item_up), NULL); gtk_widget_show(button); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); - gtk_tooltips_set_tip(tooltips, button, _("Moves up the current element in the list of selected elements."), NULL); + gtk_widget_set_tooltip_text(button, _("Moves up the current element in the list of selected elements.")); button = gtk_button_new(); image = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(button), image); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(panel_move_item_down), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(panel_move_item_down), NULL); gtk_widget_show(button); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); - gtk_tooltips_set_tip(tooltips, button, _("Moves down the current element in the list of selected elements."), NULL); + gtk_widget_set_tooltip_text(button, _("Moves down the current element in the list of selected elements.")); label = gtk_label_new(_(" ")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0);@@ -1233,7 +1197,7 @@
button = gtk_button_new(); image = gtk_image_new_from_stock(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(button), image); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(panel_add_item), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(panel_add_item), NULL); gtk_widget_show(button); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(tooltips,@@ -1245,10 +1209,10 @@
button = gtk_button_new(); image = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(button), image); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(panel_remove_item), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(panel_remove_item), NULL); gtk_widget_show(button); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); - gtk_tooltips_set_tip(tooltips, button, _("Removes the current element from the list of selected elements."), NULL); + gtk_widget_set_tooltip_text(button, _("Removes the current element from the list of selected elements.")); gtk_table_attach(GTK_TABLE(table), vbox, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);@@ -2117,7 +2081,6 @@
void create_launcher(GtkWidget *parent, GtkWindow *window) { GtkWidget *image; - GtkTooltips *tooltips = gtk_tooltips_new(); icon_theme = NULL;@@ -2207,7 +2170,7 @@
button = gtk_button_new(); image = gtk_image_new_from_stock(GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(button), image); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(launcher_move_app_up), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(launcher_move_app_up), NULL); gtk_widget_show(button); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(tooltips,@@ -2218,7 +2181,7 @@
button = gtk_button_new(); image = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(button), image); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(launcher_move_app_down), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(launcher_move_app_down), NULL); gtk_widget_show(button); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(tooltips,@@ -2234,7 +2197,7 @@
button = gtk_button_new(); image = gtk_image_new_from_stock(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(button), image); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(launcher_add_app), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(launcher_add_app), NULL); gtk_widget_show(button); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(tooltips,@@ -2246,7 +2209,7 @@
button = gtk_button_new(); image = gtk_image_new_from_stock(GTK_STOCK_GO_FORWARD, GTK_ICON_SIZE_BUTTON); gtk_button_set_image(GTK_BUTTON(button), image); - gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(launcher_remove_app), NULL); + g_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(launcher_remove_app), NULL); gtk_widget_show(button); gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0); gtk_tooltips_set_tip(tooltips,@@ -2406,7 +2369,7 @@ launcher_icon_size = gtk_spin_button_new_with_range(0, 500, 1);
gtk_widget_show(launcher_icon_size); gtk_table_attach(GTK_TABLE(table), launcher_icon_size, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, launcher_icon_size, _("Specifies the size of the launcher icons, in pixels."), NULL); + gtk_widget_set_tooltip_text(launcher_icon_size, _("Specifies the size of the launcher icons, in pixels.")); row++; col = 2;@@ -2585,7 +2548,6 @@ void create_taskbar(GtkWidget *parent)
{ GtkWidget *table, *label; int row, col; - GtkTooltips *tooltips = gtk_tooltips_new(); label = gtk_label_new(_("<b>Options</b>")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0);@@ -2733,16 +2695,16 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - taskbar_sort_order = gtk_combo_box_new_text(); + taskbar_sort_order = gtk_combo_box_text_new(); gtk_widget_show(taskbar_sort_order); gtk_table_attach(GTK_TABLE(table), taskbar_sort_order, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_sort_order), _("None")); - gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_sort_order), _("By title")); - gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_sort_order), _("By application")); - gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_sort_order), _("By center")); - gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_sort_order), _("Most recently used first")); - gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_sort_order), _("Most recently used last")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(taskbar_sort_order), _("None")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(taskbar_sort_order), _("By title")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(taskbar_sort_order), _("By application")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(taskbar_sort_order), _("By center")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(taskbar_sort_order), _("Most recently used first")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(taskbar_sort_order), _("Most recently used last")); gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_sort_order), 0); gtk_tooltips_set_tip(tooltips, taskbar_sort_order,@@ -2762,13 +2724,13 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - taskbar_alignment = gtk_combo_box_new_text(); + taskbar_alignment = gtk_combo_box_text_new(); gtk_widget_show(taskbar_alignment); gtk_table_attach(GTK_TABLE(table), taskbar_alignment, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_alignment), _("Left")); - gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_alignment), _("Center")); - gtk_combo_box_append_text(GTK_COMBO_BOX(taskbar_alignment), _("Right")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(taskbar_alignment), _("Left")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(taskbar_alignment), _("Center")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(taskbar_alignment), _("Right")); gtk_combo_box_set_active(GTK_COMBO_BOX(taskbar_alignment), 0); gtk_tooltips_set_tip(tooltips, taskbar_alignment,@@ -3008,8 +2970,8 @@ gtk_widget_show(taskbar_name_font);
gtk_table_attach(GTK_TABLE(table), taskbar_name_font, col, col + 3, row, row + 1, GTK_FILL, 0, 0, 0); col++; gtk_font_button_set_show_style(GTK_FONT_BUTTON(taskbar_name_font), TRUE); - gtk_tooltips_set_tip(tooltips, taskbar_name_font, _("Specifies the font used to display the desktop name."), NULL); - gtk_signal_connect(GTK_OBJECT(taskbar_name_font_set), + gtk_widget_set_tooltip_text(taskbar_name_font, _("Specifies the font used to display the desktop name.")); + g_signal_connect(GTK_OBJECT(taskbar_name_font_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), taskbar_name_font);@@ -3058,7 +3020,6 @@ void create_task(GtkWidget *parent)
{ GtkWidget *table, *label, *notebook; int row, col; - GtkTooltips *tooltips = gtk_tooltips_new(); label = gtk_label_new(_("<b>Mouse events</b>")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0);@@ -3079,21 +3040,21 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - task_mouse_left = gtk_combo_box_new_text(); + task_mouse_left = gtk_combo_box_text_new(); gtk_widget_show(task_mouse_left); gtk_table_attach(GTK_TABLE(table), task_mouse_left, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_left), _("None")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_left), _("Close")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_left), _("Toggle")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_left), _("Iconify")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_left), _("Shade")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_left), _("Toggle or iconify")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_left), _("Maximize or restore")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_left), _("Desktop left")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_left), _("Desktop right")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_left), _("Next task")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_left), _("Previous task")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_left), _("None")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_left), _("Close")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_left), _("Toggle")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_left), _("Iconify")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_left), _("Shade")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_left), _("Toggle or iconify")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_left), _("Maximize or restore")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_left), _("Desktop left")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_left), _("Desktop right")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_left), _("Next task")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_left), _("Previous task")); gtk_combo_box_set_active(GTK_COMBO_BOX(task_mouse_left), 5); gtk_tooltips_set_tip(tooltips, task_mouse_left,@@ -3118,21 +3079,21 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - task_mouse_scroll_up = gtk_combo_box_new_text(); + task_mouse_scroll_up = gtk_combo_box_text_new(); gtk_widget_show(task_mouse_scroll_up); gtk_table_attach(GTK_TABLE(table), task_mouse_scroll_up, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_up), _("None")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_up), _("Close")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_up), _("Toggle")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_up), _("Iconify")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_up), _("Shade")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_up), _("Toggle or iconify")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_up), _("Maximize or restore")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_up), _("Desktop left")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_up), _("Desktop right")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_up), _("Next task")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_up), _("Previous task")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_up), _("None")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_up), _("Close")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_up), _("Toggle")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_up), _("Iconify")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_up), _("Shade")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_up), _("Toggle or iconify")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_up), _("Maximize or restore")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_up), _("Desktop left")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_up), _("Desktop right")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_up), _("Next task")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_up), _("Previous task")); gtk_combo_box_set_active(GTK_COMBO_BOX(task_mouse_scroll_up), 0); gtk_tooltips_set_tip(tooltips, task_mouse_scroll_up,@@ -3157,21 +3118,21 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - task_mouse_middle = gtk_combo_box_new_text(); + task_mouse_middle = gtk_combo_box_text_new(); gtk_widget_show(task_mouse_middle); gtk_table_attach(GTK_TABLE(table), task_mouse_middle, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_middle), _("None")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_middle), _("Close")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_middle), _("Toggle")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_middle), _("Iconify")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_middle), _("Shade")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_middle), _("Toggle or iconify")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_middle), _("Maximize or restore")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_middle), _("Desktop left")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_middle), _("Desktop right")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_middle), _("Next task")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_middle), _("Previous task")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_middle), _("None")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_middle), _("Close")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_middle), _("Toggle")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_middle), _("Iconify")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_middle), _("Shade")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_middle), _("Toggle or iconify")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_middle), _("Maximize or restore")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_middle), _("Desktop left")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_middle), _("Desktop right")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_middle), _("Next task")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_middle), _("Previous task")); gtk_combo_box_set_active(GTK_COMBO_BOX(task_mouse_middle), 0); gtk_tooltips_set_tip(tooltips, task_mouse_middle,@@ -3196,21 +3157,21 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - task_mouse_scroll_down = gtk_combo_box_new_text(); + task_mouse_scroll_down = gtk_combo_box_text_new(); gtk_widget_show(task_mouse_scroll_down); gtk_table_attach(GTK_TABLE(table), task_mouse_scroll_down, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_down), _("None")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_down), _("Close")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_down), _("Toggle")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_down), _("Iconify")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_down), _("Shade")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_down), _("Toggle or iconify")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_down), _("Maximize or restore")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_down), _("Desktop left")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_down), _("Desktop right")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_down), _("Next task")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_scroll_down), _("Previous task")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_down), _("None")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_down), _("Close")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_down), _("Toggle")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_down), _("Iconify")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_down), _("Shade")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_down), _("Toggle or iconify")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_down), _("Maximize or restore")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_down), _("Desktop left")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_down), _("Desktop right")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_down), _("Next task")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_scroll_down), _("Previous task")); gtk_combo_box_set_active(GTK_COMBO_BOX(task_mouse_scroll_down), 0); gtk_tooltips_set_tip(tooltips, task_mouse_scroll_down,@@ -3235,21 +3196,21 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - task_mouse_right = gtk_combo_box_new_text(); + task_mouse_right = gtk_combo_box_text_new(); gtk_widget_show(task_mouse_right); gtk_table_attach(GTK_TABLE(table), task_mouse_right, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_right), _("None")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_right), _("Close")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_right), _("Toggle")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_right), _("Iconify")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_right), _("Shade")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_right), _("Toggle or iconify")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_right), _("Maximize or restore")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_right), _("Desktop left")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_right), _("Desktop right")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_right), _("Next task")); - gtk_combo_box_append_text(GTK_COMBO_BOX(task_mouse_right), _("Previous task")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_right), _("None")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_right), _("Close")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_right), _("Toggle")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_right), _("Iconify")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_right), _("Shade")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_right), _("Toggle or iconify")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_right), _("Maximize or restore")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_right), _("Desktop left")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_right), _("Desktop right")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_right), _("Next task")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(task_mouse_right), _("Previous task")); gtk_combo_box_set_active(GTK_COMBO_BOX(task_mouse_right), 1); gtk_tooltips_set_tip(tooltips, task_mouse_right,@@ -3292,7 +3253,7 @@ task_show_icon = gtk_check_button_new();
gtk_widget_show(task_show_icon); gtk_table_attach(GTK_TABLE(table), task_show_icon, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, task_show_icon, _("If enabled, the window icon is shown on task buttons."), NULL); + gtk_widget_set_tooltip_text(task_show_icon, _("If enabled, the window icon is shown on task buttons.")); row++, col = 2; label = gtk_label_new(_("Show text"));@@ -3305,7 +3266,7 @@ task_show_text = gtk_check_button_new();
gtk_widget_show(task_show_text); gtk_table_attach(GTK_TABLE(table), task_show_text, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, task_show_text, _("If enabled, the window title is shown on task buttons."), NULL); + gtk_widget_set_tooltip_text(task_show_text, _("If enabled, the window title is shown on task buttons.")); row++, col = 2; label = gtk_label_new(_("Center text"));@@ -3381,7 +3342,7 @@ task_maximum_width = gtk_spin_button_new_with_range(0, 9000, 1);
gtk_widget_show(task_maximum_width); gtk_table_attach(GTK_TABLE(table), task_maximum_width, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, task_maximum_width, _("Specifies the maximum width of the task buttons."), NULL); + gtk_widget_set_tooltip_text(task_maximum_width, _("Specifies the maximum width of the task buttons.")); row++, col = 2; label = gtk_label_new(_("Maximum height"));@@ -3394,7 +3355,7 @@ task_maximum_height = gtk_spin_button_new_with_range(0, 9000, 1);
gtk_widget_show(task_maximum_height); gtk_table_attach(GTK_TABLE(table), task_maximum_height, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, task_maximum_height, _("Specifies the maximum height of the task buttons."), NULL); + gtk_widget_set_tooltip_text(task_maximum_height, _("Specifies the maximum height of the task buttons.")); row++, col = 2; label = gtk_label_new(_("Horizontal padding"));@@ -3441,7 +3402,7 @@ task_spacing = gtk_spin_button_new_with_range(0, 9000, 1);
gtk_widget_show(task_spacing); gtk_table_attach(GTK_TABLE(table), task_spacing, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, task_spacing, _("Specifies the spacing between the icon and the text."), NULL); + gtk_widget_set_tooltip_text(task_spacing, _("Specifies the spacing between the icon and the text.")); row++, col = 1; task_font_set = gtk_check_button_new();@@ -3465,8 +3426,8 @@ gtk_widget_show(task_font);
gtk_table_attach(GTK_TABLE(table), task_font, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; gtk_font_button_set_show_style(GTK_FONT_BUTTON(task_font), TRUE); - gtk_tooltips_set_tip(tooltips, task_font, _("Specifies the font used to display the task button text."), NULL); - gtk_signal_connect(GTK_OBJECT(task_font_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), task_font); + gtk_widget_set_tooltip_text(task_font, _("Specifies the font used to display the task button text.")); + g_signal_connect(GTK_OBJECT(task_font_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), task_font); font_set_callback(task_font_set, task_font); change_paragraph(parent);@@ -3581,11 +3542,11 @@ child1 = task_iconified_background;
} if (child1) - gtk_widget_set_sensitive(child1, GTK_TOGGLE_BUTTON(widget)->active); + gtk_widget_set_sensitive(child1, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))); if (child2) - gtk_widget_set_sensitive(child2, GTK_TOGGLE_BUTTON(widget)->active); + gtk_widget_set_sensitive(child2, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))); if (child3) - gtk_widget_set_sensitive(child3, GTK_TOGGLE_BUTTON(widget)->active); + gtk_widget_set_sensitive(child3, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))); } void create_task_status(GtkWidget *notebook,@@ -3600,7 +3561,6 @@ GtkWidget **task_status_icon_brightness,
GtkWidget **task_status_background, GtkWidget **task_status_background_set) { - GtkTooltips *tooltips = gtk_tooltips_new(); GtkWidget *label = gtk_label_new(_(name)); gtk_widget_show(label); GtkWidget *page_task = gtk_vbox_new(FALSE, DEFAULT_HOR_SPACING);@@ -3617,7 +3577,7 @@
*task_status_color_set = gtk_check_button_new(); gtk_widget_show(*task_status_color_set); gtk_table_attach(GTK_TABLE(table), *task_status_color_set, 0, 1, 0, 1, GTK_FILL, 0, 0, 0); - gtk_signal_connect(GTK_OBJECT(*task_status_color_set), + g_signal_connect(GTK_OBJECT(*task_status_color_set), "toggled", GTK_SIGNAL_FUNC(task_status_toggle_button_callback), NULL);@@ -3643,7 +3603,7 @@
*task_status_icon_osb_set = gtk_check_button_new(); gtk_widget_show(*task_status_icon_osb_set); gtk_table_attach(GTK_TABLE(table), *task_status_icon_osb_set, 0, 1, 1, 2, GTK_FILL, 0, 0, 0); - gtk_signal_connect(GTK_OBJECT(*task_status_icon_osb_set), + g_signal_connect(GTK_OBJECT(*task_status_icon_osb_set), "toggled", GTK_SIGNAL_FUNC(task_status_toggle_button_callback), NULL);@@ -3697,7 +3657,7 @@
*task_status_background_set = gtk_check_button_new(); gtk_widget_show(*task_status_background_set); gtk_table_attach(GTK_TABLE(table), *task_status_background_set, 0, 1, 4, 5, GTK_FILL, 0, 0, 0); - gtk_signal_connect(GTK_OBJECT(*task_status_background_set), + g_signal_connect(GTK_OBJECT(*task_status_background_set), "toggled", GTK_SIGNAL_FUNC(task_status_toggle_button_callback), NULL);@@ -3729,7 +3689,7 @@
task_urgent_blinks = gtk_spin_button_new_with_range(0, 1000000, 1); gtk_widget_show(task_urgent_blinks); gtk_table_attach(GTK_TABLE(table), task_urgent_blinks, 2, 3, 5, 6, GTK_FILL, 0, 0, 0); - gtk_tooltips_set_tip(tooltips, task_urgent_blinks, _("Specifies how many times urgent tasks blink."), NULL); + gtk_widget_set_tooltip_text(task_urgent_blinks, _("Specifies how many times urgent tasks blink.")); } task_status_toggle_button_callback(*task_status_color_set, NULL);@@ -3742,7 +3702,6 @@ {
GtkWidget *table; GtkWidget *label; int row, col; - GtkTooltips *tooltips = gtk_tooltips_new(); table = gtk_table_new(1, 2, FALSE); gtk_widget_show(table);@@ -4031,7 +3990,7 @@ gtk_tooltips_set_tip(tooltips,
clock_font_line1, _("Specifies the font used to display the first line of the clock."), NULL); - gtk_signal_connect(GTK_OBJECT(clock_font_line1_set), + g_signal_connect(GTK_OBJECT(clock_font_line1_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), clock_font_line1);@@ -4067,7 +4026,7 @@ gtk_tooltips_set_tip(tooltips,
clock_font_line2, _("Specifies the font used to display the second line of the clock."), NULL); - gtk_signal_connect(GTK_OBJECT(clock_font_line2_set), + g_signal_connect(GTK_OBJECT(clock_font_line2_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), clock_font_line2);@@ -4085,7 +4044,7 @@ gtk_color_button_set_use_alpha(GTK_COLOR_BUTTON(clock_font_color), TRUE);
gtk_widget_show(clock_font_color); gtk_table_attach(GTK_TABLE(table), clock_font_color, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, clock_font_color, _("Specifies the font color used to display the clock."), NULL); + gtk_widget_set_tooltip_text(clock_font_color, _("Specifies the font color used to display the clock.")); change_paragraph(parent);@@ -4215,13 +4174,13 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - separator->separator_style = gtk_combo_box_new_text(); + separator->separator_style = gtk_combo_box_text_new(); gtk_widget_show(separator->separator_style); gtk_table_attach(GTK_TABLE(table), separator->separator_style, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(separator->separator_style), _("Empty")); - gtk_combo_box_append_text(GTK_COMBO_BOX(separator->separator_style), _("Line")); - gtk_combo_box_append_text(GTK_COMBO_BOX(separator->separator_style), _("Dots")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(separator->separator_style), _("Empty")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(separator->separator_style), _("Line")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(separator->separator_style), _("Dots")); gtk_combo_box_set_active(GTK_COMBO_BOX(separator->separator_style), 2); row++, col = 2;@@ -4270,7 +4229,6 @@ {
GtkWidget *label; GtkWidget *table; int row, col; - GtkTooltips *tooltips = gtk_tooltips_new(); Executor *executor = &g_array_index(executors, Executor, i);@@ -4317,7 +4275,7 @@ gtk_widget_show(executor->execp_command);
gtk_entry_set_width_chars(GTK_ENTRY(executor->execp_command), 50); gtk_table_attach(GTK_TABLE(table), executor->execp_command, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, executor->execp_command, _("Specifies the command to execute."), NULL); + gtk_widget_set_tooltip_text(executor->execp_command, _("Specifies the command to execute.")); row++, col = 2; label = gtk_label_new(_("Interval"));@@ -4595,7 +4553,7 @@ gtk_widget_show(executor->execp_font);
gtk_table_attach(GTK_TABLE(table), executor->execp_font, col, col + 3, row, row + 1, GTK_FILL, 0, 0, 0); col++; gtk_font_button_set_show_style(GTK_FONT_BUTTON(executor->execp_font), TRUE); - gtk_signal_connect(GTK_OBJECT(executor->execp_font_set), + g_signal_connect(GTK_OBJECT(executor->execp_font_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), executor->execp_font);@@ -4637,7 +4595,7 @@ executor->execp_icon_w = gtk_spin_button_new_with_range(0, 1000000, 1);
gtk_widget_show(executor->execp_icon_w); gtk_table_attach(GTK_TABLE(table), executor->execp_icon_w, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, executor->execp_icon_w, _("If non-zero, the image is resized to this width."), NULL); + gtk_widget_set_tooltip_text(executor->execp_icon_w, _("If non-zero, the image is resized to this width.")); row++, col = 2; label = gtk_label_new(_("Icon height"));@@ -4650,7 +4608,7 @@ executor->execp_icon_h = gtk_spin_button_new_with_range(0, 1000000, 1);
gtk_widget_show(executor->execp_icon_h); gtk_table_attach(GTK_TABLE(table), executor->execp_icon_h, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, executor->execp_icon_h, _("If non-zero, the image is resized to this height."), NULL); + gtk_widget_set_tooltip_text(executor->execp_icon_h, _("If non-zero, the image is resized to this height.")); row++, col = 2; label = gtk_label_new(_("Tooltip"));@@ -4691,7 +4649,6 @@ {
GtkWidget *label; GtkWidget *table; int row, col; - GtkTooltips *tooltips = gtk_tooltips_new(); Button *button = &g_array_index(buttons, Button, i);@@ -4951,7 +4908,7 @@ gtk_widget_show(button->button_font);
gtk_table_attach(GTK_TABLE(table), button->button_font, col, col + 3, row, row + 1, GTK_FILL, 0, 0, 0); col++; gtk_font_button_set_show_style(GTK_FONT_BUTTON(button->button_font), TRUE); - gtk_signal_connect(GTK_OBJECT(button->button_font_set), + g_signal_connect(GTK_OBJECT(button->button_font_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), button->button_font);@@ -5182,7 +5139,6 @@ {
GtkWidget *table; GtkWidget *label; int row, col; - GtkTooltips *tooltips = gtk_tooltips_new(); label = gtk_label_new(_("<b>Options</b>")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0);@@ -5204,14 +5160,14 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - systray_icon_order = gtk_combo_box_new_text(); + systray_icon_order = gtk_combo_box_text_new(); gtk_widget_show(systray_icon_order); gtk_table_attach(GTK_TABLE(table), systray_icon_order, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(systray_icon_order), _("Ascending")); - gtk_combo_box_append_text(GTK_COMBO_BOX(systray_icon_order), _("Descending")); - gtk_combo_box_append_text(GTK_COMBO_BOX(systray_icon_order), _("Left to right")); - gtk_combo_box_append_text(GTK_COMBO_BOX(systray_icon_order), _("Right to left")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(systray_icon_order), _("Ascending")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(systray_icon_order), _("Descending")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(systray_icon_order), _("Left to right")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(systray_icon_order), _("Right to left")); gtk_combo_box_set_active(GTK_COMBO_BOX(systray_icon_order), 0); gtk_tooltips_set_tip(tooltips, systray_icon_order,@@ -5230,17 +5186,17 @@ gtk_widget_show(label);
gtk_table_attach(GTK_TABLE(table), label, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - systray_monitor = gtk_combo_box_new_text(); + systray_monitor = gtk_combo_box_text_new(); gtk_widget_show(systray_monitor); gtk_table_attach(GTK_TABLE(table), systray_monitor, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_combo_box_append_text(GTK_COMBO_BOX(systray_monitor), _("Primary")); - gtk_combo_box_append_text(GTK_COMBO_BOX(systray_monitor), _("1")); - gtk_combo_box_append_text(GTK_COMBO_BOX(systray_monitor), _("2")); - gtk_combo_box_append_text(GTK_COMBO_BOX(systray_monitor), _("3")); - gtk_combo_box_append_text(GTK_COMBO_BOX(systray_monitor), _("4")); - gtk_combo_box_append_text(GTK_COMBO_BOX(systray_monitor), _("5")); - gtk_combo_box_append_text(GTK_COMBO_BOX(systray_monitor), _("6")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(systray_monitor), _("Primary")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(systray_monitor), _("1")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(systray_monitor), _("2")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(systray_monitor), _("3")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(systray_monitor), _("4")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(systray_monitor), _("5")); + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(systray_monitor), _("6")); gtk_combo_box_set_active(GTK_COMBO_BOX(systray_monitor), 0); gtk_tooltips_set_tip(tooltips, systray_monitor,@@ -5327,7 +5283,7 @@ systray_spacing = gtk_spin_button_new_with_range(0, 500, 1);
gtk_widget_show(systray_spacing); gtk_table_attach(GTK_TABLE(table), systray_spacing, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, systray_spacing, _("Specifies the spacing between system tray icons."), NULL); + gtk_widget_set_tooltip_text(systray_spacing, _("Specifies the spacing between system tray icons.")); row++; col = 2;@@ -5418,7 +5374,6 @@ void create_battery(GtkWidget *parent)
{ GtkWidget *table, *label; int row, col; - GtkTooltips *tooltips = gtk_tooltips_new(); table = gtk_table_new(1, 2, FALSE); gtk_widget_show(table);@@ -5473,7 +5428,7 @@ battery_alert_if_lower = gtk_spin_button_new_with_range(0, 100, 1);
gtk_widget_show(battery_alert_if_lower); gtk_table_attach(GTK_TABLE(table), battery_alert_if_lower, col, col + 1, row, row + 1, GTK_FILL, 0, 0, 0); col++; - gtk_tooltips_set_tip(tooltips, battery_alert_if_lower, _("Battery level for which to display an alert."), NULL); + gtk_widget_set_tooltip_text(battery_alert_if_lower, _("Battery level for which to display an alert.")); label = gtk_label_new(_("%")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0);@@ -5770,7 +5725,7 @@ gtk_tooltips_set_tip(tooltips,
battery_font_line1, _("Specifies the font used to display the first line of the battery text."), NULL); - gtk_signal_connect(GTK_OBJECT(battery_font_line1_set), + g_signal_connect(GTK_OBJECT(battery_font_line1_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), battery_font_line1);@@ -5805,7 +5760,7 @@ gtk_tooltips_set_tip(tooltips,
battery_font_line2, _("Specifies the font used to display the second line of the battery text."), NULL); - gtk_signal_connect(GTK_OBJECT(battery_font_line2_set), + g_signal_connect(GTK_OBJECT(battery_font_line2_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), battery_font_line2);@@ -5877,7 +5832,6 @@ {
GtkWidget *table; GtkWidget *label; int row, col; - GtkTooltips *tooltips = gtk_tooltips_new(); label = gtk_label_new(_("<b>Timing</b>")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0);@@ -6023,8 +5977,8 @@ gtk_widget_show(tooltip_font);
gtk_table_attach(GTK_TABLE(table), tooltip_font, col, col + 3, row, row + 1, GTK_FILL, 0, 0, 0); col++; gtk_font_button_set_show_style(GTK_FONT_BUTTON(tooltip_font), TRUE); - gtk_tooltips_set_tip(tooltips, tooltip_font, _("Specifies the font used to display the text of the tooltip."), NULL); - gtk_signal_connect(GTK_OBJECT(tooltip_font_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), tooltip_font); + gtk_widget_set_tooltip_text(tooltip_font, _("Specifies the font used to display the text of the tooltip.")); + g_signal_connect(GTK_OBJECT(tooltip_font_set), "toggled", GTK_SIGNAL_FUNC(font_set_callback), tooltip_font); font_set_callback(tooltip_font_set, tooltip_font); row++, col = 2;
M
src/tint2conf/properties_rw.c
→
src/tint2conf/properties_rw.c
@@ -1855,10 +1855,12 @@ free(path);
} else if (strcmp(key, "launcher_apps_dir") == 0) { char *path = expand_tilde(value); - if (gtk_entry_get_text_length(GTK_ENTRY(launcher_apps_dirs)) > 0) { - gtk_entry_append_text(GTK_ENTRY(launcher_apps_dirs), ","); + int position = gtk_entry_get_text_length(GTK_ENTRY(launcher_apps_dirs)); + if (position > 0) { + gtk_editable_insert_text(GTK_EDITABLE(launcher_apps_dirs), ",", 1, &position); } - gtk_entry_append_text(GTK_ENTRY(launcher_apps_dirs), path); + position = gtk_entry_get_text_length(GTK_ENTRY(launcher_apps_dirs)); + gtk_editable_insert_text(GTK_EDITABLE(launcher_apps_dirs), path, strlen(path), &position); free(path); } else if (strcmp(key, "launcher_icon_theme") == 0) {
M
tint2.includes
→
tint2.includes
@@ -22,7 +22,7 @@ /usr/include/libpng12
/usr/include/librsvg-2.0 /usr/include/gdk-pixbuf-2.0 /usr/include/startup-notification-1.0 -/usr/include/gtk-2.0 +/usr/include/gtk-3.0 /usr/lib/x86_64-linux-gnu/gtk-2.0/include /usr/include/atk-1.0 /usr/include/gio-unix-2.0