Commit 088fb10d authored by Jiri (George) Lebl's avatar Jiri (George) Lebl Committed by George Lebl

I'm a dubmass! GdkCursor is NOT a GObject

Wed Dec 26 17:45:49 2001  George Lebl <jirka@5z.com>

	* gnome-panel-screenshot.c, menu.c, panel.c, panel-util.c,
	  panel-widget.c:  I'm a dubmass!  GdkCursor is NOT a GObject

	* foobar-widget.c:  a bit of cleanup
parent 33fda156
Wed Dec 26 17:45:49 2001 George Lebl <jirka@5z.com>
* gnome-panel-screenshot.c, menu.c, panel.c, panel-util.c,
panel-widget.c: I'm a dubmass! GdkCursor is NOT a GObject
* foobar-widget.c: a bit of cleanup
Wed Dec 26 16:25:50 2001 George Lebl <jirka@5z.com> Wed Dec 26 16:25:50 2001 George Lebl <jirka@5z.com>
* Makefile.am, basep-widget.c, button-widget.c, foobar-widget.c, * Makefile.am, basep-widget.c, button-widget.c, foobar-widget.c,
......
...@@ -339,7 +339,7 @@ update_clock (FoobarWidget *foo) ...@@ -339,7 +339,7 @@ update_clock (FoobarWidget *foo)
} }
hour[sizeof(hour)-1] = '\0'; /* just for sanity */ hour[sizeof(hour)-1] = '\0'; /* just for sanity */
str_utf8 = g_locale_to_utf8((const gchar *)hour, strlen(hour), NULL, NULL, NULL); str_utf8 = g_locale_to_utf8 (hour, -1, NULL, NULL, NULL);
gtk_tooltips_set_tip (panel_tooltips, foo->clock_ebox, gtk_tooltips_set_tip (panel_tooltips, foo->clock_ebox,
sure_string (str_utf8), NULL); sure_string (str_utf8), NULL);
...@@ -356,7 +356,7 @@ update_clock (FoobarWidget *foo) ...@@ -356,7 +356,7 @@ update_clock (FoobarWidget *foo)
} }
hour[sizeof(hour)-1] = '\0'; /* just for sanity */ hour[sizeof(hour)-1] = '\0'; /* just for sanity */
str_utf8 = g_locale_to_utf8((const gchar *)hour, strlen(hour), NULL, NULL, NULL); str_utf8 = g_locale_to_utf8 (hour, -1, NULL, NULL, NULL);
if (str_utf8 != NULL) { if (str_utf8 != NULL) {
layout = gtk_widget_create_pango_layout (foo->clock_label, str_utf8); layout = gtk_widget_create_pango_layout (foo->clock_label, str_utf8);
...@@ -433,7 +433,7 @@ append_format_items (GtkWidget *menu) ...@@ -433,7 +433,7 @@ append_format_items (GtkWidget *menu)
} }
hour[sizeof(hour)-1] = '\0'; /* just for sanity */ hour[sizeof(hour)-1] = '\0'; /* just for sanity */
str_utf8 = g_locale_to_utf8((const gchar *)hour, strlen(hour), NULL, NULL, NULL); str_utf8 = g_locale_to_utf8 (hour, -1, NULL, NULL, NULL);
item = gtk_radio_menu_item_new_with_label (group, sure_string (str_utf8)); item = gtk_radio_menu_item_new_with_label (group, sure_string (str_utf8));
g_free (str_utf8); g_free (str_utf8);
...@@ -559,7 +559,7 @@ foobar_widget_set_clock_format (FoobarWidget *foo, const char *clock_format) ...@@ -559,7 +559,7 @@ foobar_widget_set_clock_format (FoobarWidget *foo, const char *clock_format)
} }
hour[sizeof(hour)-1] = '\0'; /* just for sanity */ hour[sizeof(hour)-1] = '\0'; /* just for sanity */
str_utf8 = g_locale_to_utf8((const gchar *)hour, strlen(hour), NULL, NULL, NULL); str_utf8 = g_locale_to_utf8 (hour, -1, NULL, NULL, NULL);
if (str_utf8 != NULL) { if (str_utf8 != NULL) {
layout = gtk_widget_create_pango_layout (foo->clock_label, str_utf8); layout = gtk_widget_create_pango_layout (foo->clock_label, str_utf8);
pango_layout_get_pixel_size (layout, &width, NULL); pango_layout_get_pixel_size (layout, &width, NULL);
......
...@@ -528,7 +528,7 @@ print_pixbuf (void) ...@@ -528,7 +528,7 @@ print_pixbuf (void)
gtk_widget_set_sensitive (GTK_WIDGET (print_dialog), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (print_dialog), FALSE);
cursor = gdk_cursor_new (GDK_WATCH); cursor = gdk_cursor_new (GDK_WATCH);
gdk_window_set_cursor (GTK_WIDGET (print_dialog)->window, cursor); gdk_window_set_cursor (GTK_WIDGET (print_dialog)->window, cursor);
g_object_unref (G_OBJECT (cursor)); gdk_cursor_unref (cursor);
gtk_widget_show (GTK_WIDGET (gpmp)); gtk_widget_show (GTK_WIDGET (gpmp));
gtk_window_set_modal (GTK_WINDOW (gpmp), TRUE); gtk_window_set_modal (GTK_WINDOW (gpmp), TRUE);
...@@ -633,7 +633,7 @@ setup_busy (gboolean busy) ...@@ -633,7 +633,7 @@ setup_busy (gboolean busy)
/* Change cursor to busy */ /* Change cursor to busy */
cursor = gdk_cursor_new (GDK_WATCH); cursor = gdk_cursor_new (GDK_WATCH);
gdk_window_set_cursor (toplevel->window, cursor); gdk_window_set_cursor (toplevel->window, cursor);
g_object_unref (G_OBJECT (cursor)); gdk_cursor_unref (cursor);
} else { } else {
gdk_window_set_cursor (toplevel->window, NULL); gdk_window_set_cursor (toplevel->window, NULL);
} }
......
...@@ -1153,7 +1153,7 @@ restore_grabs(GtkWidget *w, gpointer data) ...@@ -1153,7 +1153,7 @@ restore_grabs(GtkWidget *w, gpointer data)
GDK_ENTER_NOTIFY_MASK | GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK, GDK_LEAVE_NOTIFY_MASK,
NULL, cursor, 0) == 0); NULL, cursor, 0) == 0);
g_object_unref (G_OBJECT (cursor)); gdk_cursor_unref (cursor);
} }
gtk_grab_add (GTK_WIDGET (menu)); gtk_grab_add (GTK_WIDGET (menu));
...@@ -1746,7 +1746,7 @@ drag_end_menu_cb (GtkWidget *widget, GdkDragContext *context) ...@@ -1746,7 +1746,7 @@ drag_end_menu_cb (GtkWidget *widget, GdkDragContext *context)
} }
} }
g_object_unref (G_OBJECT (cursor)); gdk_cursor_unref (cursor);
} }
} }
......
...@@ -950,7 +950,7 @@ panel_push_window_busy (GtkWidget *window) ...@@ -950,7 +950,7 @@ panel_push_window_busy (GtkWidget *window)
if (window->window != NULL) { if (window->window != NULL) {
GdkCursor *cursor = gdk_cursor_new (GDK_WATCH); GdkCursor *cursor = gdk_cursor_new (GDK_WATCH);
gdk_window_set_cursor (window->window, cursor); gdk_window_set_cursor (window->window, cursor);
g_object_unref (G_OBJECT (cursor)); gdk_cursor_unref (cursor);
gdk_flush (); gdk_flush ();
} }
} }
......
...@@ -2060,7 +2060,7 @@ panel_widget_applet_drag_start (PanelWidget *panel, ...@@ -2060,7 +2060,7 @@ panel_widget_applet_drag_start (PanelWidget *panel,
NULL, NULL,
fleur_cursor, fleur_cursor,
GDK_CURRENT_TIME); GDK_CURRENT_TIME);
g_object_unref (G_OBJECT (fleur_cursor)); gdk_cursor_unref (fleur_cursor);
gdk_flush (); gdk_flush ();
} }
} }
......
...@@ -89,9 +89,9 @@ enum { ...@@ -89,9 +89,9 @@ enum {
static void static void
change_window_cursor(GdkWindow *window, GdkCursorType cursor_type) change_window_cursor(GdkWindow *window, GdkCursorType cursor_type)
{ {
GdkCursor *cursor = gdk_cursor_new(cursor_type); GdkCursor *cursor = gdk_cursor_new (cursor_type);
gdk_window_set_cursor(window, cursor); gdk_window_set_cursor (window, cursor);
g_object_unref (G_OBJECT (cursor)); gdk_cursor_unref (cursor);
} }
static void static void
...@@ -661,7 +661,7 @@ panel_initiate_move (GtkWidget *widget, guint32 event_time) ...@@ -661,7 +661,7 @@ panel_initiate_move (GtkWidget *widget, guint32 event_time)
NULL, NULL,
cursor, cursor,
event_time); event_time);
g_object_unref (G_OBJECT (cursor)); gdk_cursor_unref (cursor);
if (basep) { if (basep) {
basep->autohide_inhibit = TRUE; basep->autohide_inhibit = TRUE;
......
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