[gnome-photos] Replace GdHeaderBar with GtkHeaderBar
- From: Debarshi Ray <debarshir src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos] Replace GdHeaderBar with GtkHeaderBar
- Date: Sat, 27 Jul 2013 13:07:11 +0000 (UTC)
commit cc6aa168c485d2bfde508b6fbbe8245ad3bce418
Author: Debarshi Ray <debarshir gnome org>
Date: Wed Jul 24 00:38:05 2013 +0200
Replace GdHeaderBar with GtkHeaderBar
src/photos-header-bar.c | 6 +++---
src/photos-header-bar.h | 4 ++--
src/photos-main-toolbar.c | 12 ++++++------
3 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/photos-header-bar.c b/src/photos-header-bar.c
index cf22c34..5001f80 100644
--- a/src/photos-header-bar.c
+++ b/src/photos-header-bar.c
@@ -36,7 +36,7 @@ struct _PhotosHeaderBarPrivate
};
-G_DEFINE_TYPE (PhotosHeaderBar, photos_header_bar, GD_TYPE_HEADER_BAR);
+G_DEFINE_TYPE (PhotosHeaderBar, photos_header_bar, GTK_TYPE_HEADER_BAR);
static void
@@ -143,7 +143,7 @@ photos_header_bar_set_mode (PhotosHeaderBar *self, PhotosHeaderBarMode mode)
g_assert_not_reached ();
}
- gd_header_bar_set_custom_title (GD_HEADER_BAR (self), custom_title);
+ gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self), custom_title);
}
@@ -166,7 +166,7 @@ photos_header_bar_set_selection_menu (PhotosHeaderBar *self, GdHeaderButton *sel
}
if (priv->mode == PHOTOS_HEADER_BAR_MODE_SELECTION)
- gd_header_bar_set_custom_title (GD_HEADER_BAR (self), priv->selection_menu);
+ gtk_header_bar_set_custom_title (GTK_HEADER_BAR (self), priv->selection_menu);
}
diff --git a/src/photos-header-bar.h b/src/photos-header-bar.h
index 6043bcd..6df2f4b 100644
--- a/src/photos-header-bar.h
+++ b/src/photos-header-bar.h
@@ -66,13 +66,13 @@ typedef struct _PhotosHeaderBarPrivate PhotosHeaderBarPrivate;
struct _PhotosHeaderBar
{
- GdHeaderBar parent_instance;
+ GtkHeaderBar parent_instance;
PhotosHeaderBarPrivate *priv;
};
struct _PhotosHeaderBarClass
{
- GdHeaderBarClass parent_class;
+ GtkHeaderBarClass parent_class;
};
GType photos_header_bar_get_type (void) G_GNUC_CONST;
diff --git a/src/photos-main-toolbar.c b/src/photos-main-toolbar.c
index c385ca1..3bbbf06 100644
--- a/src/photos-main-toolbar.c
+++ b/src/photos-main-toolbar.c
@@ -125,7 +125,7 @@ photos_main_toolbar_set_toolbar_title (PhotosMainToolbar *self)
if (selection_mode)
gd_header_button_set_label (GD_HEADER_BUTTON (priv->selection_menu), primary);
else
- gd_header_bar_set_title (GD_HEADER_BAR (priv->toolbar), primary);
+ gtk_header_bar_set_title (GTK_HEADER_BAR (priv->toolbar), primary);
g_free (primary);
}
@@ -145,7 +145,7 @@ photos_main_toolbar_add_back_button (PhotosMainToolbar *self)
back_button = gd_header_simple_button_new ();
gd_header_button_set_label (GD_HEADER_BUTTON (back_button), _("Back"));
gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (back_button), icon_name);
- gd_header_bar_pack_start (GD_HEADER_BAR (priv->toolbar), back_button);
+ gtk_header_bar_pack_start (GTK_HEADER_BAR (priv->toolbar), back_button);
return back_button;
}
@@ -238,7 +238,7 @@ photos_main_toolbar_add_remote_display_button (PhotosMainToolbar *self)
label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (priv->remote_display_button)));
gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_MIDDLE);
gtk_widget_set_margin_right (priv->remote_display_button, 12);
- gd_header_bar_pack_start (GD_HEADER_BAR (priv->toolbar), priv->remote_display_button);
+ gtk_header_bar_pack_start (GTK_HEADER_BAR (priv->toolbar), priv->remote_display_button);
gtk_widget_show_all (priv->remote_display_button);
g_signal_connect (priv->remote_display_button, "clicked",
@@ -256,7 +256,7 @@ photos_main_toolbar_add_selection_button (PhotosMainToolbar *self)
selection_button = gd_header_simple_button_new ();
gd_header_button_set_label (GD_HEADER_BUTTON (selection_button), _("Select Items"));
gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (selection_button), "object-select-symbolic");
- gd_header_bar_pack_end (GD_HEADER_BAR (priv->toolbar), selection_button);
+ gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->toolbar), selection_button);
g_signal_connect (selection_button, "clicked", G_CALLBACK (photos_main_toolbar_select_button_clicked),
self);
g_signal_connect_object (priv->col_mngr,
@@ -439,7 +439,7 @@ photos_main_toolbar_populate_for_preview (PhotosMainToolbar *self)
gtk_actionable_set_action_name (GTK_ACTIONABLE (menu_button), "app.gear-menu");
gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (menu_button), G_MENU_MODEL (preview_menu));
gd_header_button_set_symbolic_icon_name (GD_HEADER_BUTTON (menu_button), "emblem-system-symbolic");
- gd_header_bar_pack_end (GD_HEADER_BAR (priv->toolbar), menu_button);
+ gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->toolbar), menu_button);
g_simple_action_set_enabled (priv->gear_menu, TRUE);
@@ -463,7 +463,7 @@ photos_main_toolbar_populate_for_selection_mode (PhotosMainToolbar *self)
selection_button = gd_header_simple_button_new ();
gd_header_button_set_label (GD_HEADER_BUTTON (selection_button), _("Done"));
- gd_header_bar_pack_end (GD_HEADER_BAR (priv->toolbar), selection_button);
+ gtk_header_bar_pack_end (GTK_HEADER_BAR (priv->toolbar), selection_button);
context = gtk_widget_get_style_context (selection_button);
gtk_style_context_add_class (context, "suggested-action");
g_signal_connect (selection_button, "clicked", G_CALLBACK (photos_main_toolbar_done_button_clicked), self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]